[parrot/parrot] d74cf4: fix build warnings in src/embed/api.c

[noreply at github.com]

Branch: refs/heads/embed_api2
Home:   https://github.com/parrot/parrot

Commit: d74cf45358fa6b8365da04f43d1480c6e7643a01
    https://github.com/parrot/parrot/commit/d74cf45358fa6b8365da04f43d1480c6e7643a01
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-12 (Sun, 12 Dec 2010)

Changed paths:
  M include/parrot/api.h
  M src/embed/api.c

Log Message:
-----------
fix build warnings in src/embed/api.c


Commit: eaafc83f47c1ebb14cbbb43389b1151184230281
    https://github.com/parrot/parrot/commit/eaafc83f47c1ebb14cbbb43389b1151184230281
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-12 (Sun, 12 Dec 2010)

Changed paths:
  M tools/build/parrot_config_c.pl

Log Message:
-----------
fix build warnings in generated *_config.c files


Commit: 13686bc87fc5d3f4d4d01a9fa612f812a4039ec3
    https://github.com/parrot/parrot/commit/13686bc87fc5d3f4d4d01a9fa612f812a4039ec3
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-12 (Sun, 12 Dec 2010)

Changed paths:
  M compilers/imcc/Rules.in
  M config/gen/makefiles/root.in
  M include/parrot/api.h
  M src/dynpmc/Defines.in
  M src/dynpmc/Rules.in
  M src/embed/api.c

Log Message:
-----------
merge, fixing conflicts