diff options
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 4 | ||||
| -rw-r--r-- | newlib/doc/makedoc.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index d7ad83586..4b5aa14d7 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,7 @@ +2012-09-26 Michael Hope <michael.hope@linaro.org> + + * doc/makedoc.c (dup_): Rename to avoid colliding with dup(2). + 2012-09-13 Anthony Green <green@moxielogic.com> * libc/include/machine/ieeefp.h (__IEEE_BIG_ENDIAN): Add bi-endian diff --git a/newlib/doc/makedoc.c b/newlib/doc/makedoc.c index 0bbffb66b..7d38a5db8 100644 --- a/newlib/doc/makedoc.c +++ b/newlib/doc/makedoc.c @@ -1012,7 +1012,7 @@ WORD(swap) } -WORD(dup) +WORD(dup_) { tos++; init_string(tos); @@ -1410,7 +1410,7 @@ char *av[]) add_intrinsic("skip_past_newline", skip_past_newline ); add_intrinsic("catstr", icatstr ); add_intrinsic("copy_past_newline", icopy_past_newline ); - add_intrinsic("dup", dup ); + add_intrinsic("dup", dup_ ); add_intrinsic("remchar", remchar ); add_intrinsic("get_stuff_in_command", get_stuff_in_command ); add_intrinsic("get_stuff_in_angle", get_stuff_in_angle ); |