From: Bruno Haible <bruno@clisp.org>
Date: Tue, 18 Nov 2003 15:24:01 +0000 (+0000)
Subject: Avoid a prototype clash on Solaris 2.5.1.
X-Git-Tag: v0.13~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=151f856b27279d9844516450c4225c17473488d2;p=thirdparty%2Fgettext.git

Avoid a prototype clash on Solaris 2.5.1.
---

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 1a604ea77..76b514e0f 100644
--- 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 ad796c682..336843ddd 100644
--- 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>