Avoid a prototype clash on Solaris 2.5.1.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 1a604ea770b9db3a0f19d86bc9b75c3956045867..76b514e0f103405f8c57a37f653bb4f80dae1136 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-17  Bruno Haible  <bruno@clisp.org>
+
+       * canonicalize.c: #undef realpath after <config.h> but before the
+       system includes, so as to avoid a prototype clash on Solaris 2.5.1.
+       Reported by Warren L. Dodge <warrend@mdhost.cse.tek.com>.
+
 2003-11-17  Bruno Haible  <bruno@clisp.org>
 
        * wait-process.c (wait_process): Disable the 2003-10-31 waitid() patch.

diff --git a/gettext-tools/lib/canonicalize.c b/gettext-tools/lib/canonicalize.c
index ad796c682d2f5657d445a597b42c749a6e800ffa..336843ddd31a2fe3ec9580b522ddf9297194e5e6 100644 (file)
--- a/gettext-tools/lib/canonicalize.c
+++ b/gettext-tools/lib/canonicalize.c
@@ -21,6 +21,10 @@
 # include <config.h>
 #endif
 
+/* Avoid a clash of our rpl_realpath() function with the prototype in
+   <stdlib.h> on Solaris 2.5.1.  */
+#undef realpath
+
 #if !HAVE_CANONICALIZE_FILE_NAME || defined _LIBC
 
 #include <alloca.h>