2012-09-26 Michael Hope <michael.hope@linaro.org>

        * doc/makedoc.c (dup_): Rename to avoid colliding with dup(2).

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d7ad83586bb3fa68fa963d285e229546f620a70c..4b5aa14d70afa6c98d86a83cf81f8f7f29446c04 100644 (file)
--- 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 0bbffb66b10a952f103295c79f96218510119cd8..7d38a5db8dad82d98730e2dea4a0cd34175653bb 100644 (file)
--- 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 );