From: Bruno Haible <bruno@clisp.org>
Date: Tue, 7 Dec 2010 02:32:46 +0000 (+0100)
Subject: unistr/u8-strcmp: Avoid collision with libc function on Solaris 11.
X-Git-Tag: v0.1~3567
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=64911207854610668b480939469282fdaeb96f74;p=gnulib.git

unistr/u8-strcmp: Avoid collision with libc function on Solaris 11.

* lib/unistr.in.h (u8_strcmp) [__sun]: Declare with real name
u8_strcmp_gnu.
* modules/unistr/u8-strcmp (configure.ac): Bump version number.
---

diff --git a/ChangeLog b/ChangeLog
index fc04230a1..b1ad4705b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-07  Bruno Haible  <bruno@clisp.org>
+
+	unistr/u8-strcmp: Avoid collision with libc function on Solaris 11.
+	* lib/unistr.in.h (u8_strcmp) [__sun]: Declare with real name
+	u8_strcmp_gnu.
+	* modules/unistr/u8-strcmp (configure.ac): Bump version number.
+
 2010-12-06  Bruno Haible  <bruno@clisp.org>
 
 	Update internal documentation.
diff --git a/lib/unistr.in.h b/lib/unistr.in.h
index e574f9477..2e7c6184c 100644
--- a/lib/unistr.in.h
+++ b/lib/unistr.in.h
@@ -559,8 +559,15 @@ extern uint32_t *
 
 /* Compare S1 and S2.  */
 /* Similar to strcmp(), wcscmp().  */
+#ifdef __sun
+/* Avoid a collision with the u8_strcmp() function in Solaris 11 libc.  */
+extern int
+       u8_strcmp_gnu (const uint8_t *s1, const uint8_t *s2);
+# define u8_strcmp u8_strcmp_gnu
+#else
 extern int
        u8_strcmp (const uint8_t *s1, const uint8_t *s2);
+#endif
 extern int
        u16_strcmp (const uint16_t *s1, const uint16_t *s2);
 extern int
diff --git a/modules/unistr/u8-strcmp b/modules/unistr/u8-strcmp
index 32ea95beb..8d81f4dcc 100644
--- a/modules/unistr/u8-strcmp
+++ b/modules/unistr/u8-strcmp
@@ -8,7 +8,7 @@ Depends-on:
 unistr/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strcmp])
+gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-strcmp])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNISTR_U8_STRCMP