From: Bruno Haible <bruno@clisp.org>
Date: Wed, 1 Nov 2006 20:48:47 +0000 (+0000)
Subject: Fix clash of strncasecmp prototypes in C++ mode.
X-Git-Tag: cvs-readonly~1620
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=5e1081571892e195ddca48d965cb15fa608ceb10;hp=9bf04ecdb623a3520978ddb2b1f443258ff19756;p=gnulib.git

Fix clash of strncasecmp prototypes in C++ mode.
---

diff --git a/ChangeLog b/ChangeLog
index 0bdba7f09..b975ac76c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-11-01  Bruno Haible  <bruno@clisp.org>
 
+	* m4/strcase.m4 (gl_FUNC_STRNCASECMP): Check whether strncasecmp is
+	already declared in <string.h>.
+	* lib/strcase.h (strncasecmp): Don't declare it if yes.
+
+2006-11-01  Bruno Haible  <bruno@clisp.org>
+
 	* m4/strcase.m4 (gl_FUNC_STRCASECMP): Don't define strcasecmp here.
 	* lib/strcase.h: Include <string.h>.
 	(strcasecmp): Define to rpl_strcasecmp here.
diff --git a/lib/strcase.h b/lib/strcase.h
index fa5a68dc1..07d4c9a42 100644
--- a/lib/strcase.h
+++ b/lib/strcase.h
@@ -43,7 +43,9 @@ extern int strcasecmp (const char *s1, const char *s2);
    returning less than, equal to or greater than zero if S1 is
    lexicographically less than, equal to or greater than S2.
    Note: This function can not work correctly in multibyte locales.  */
+#if ! HAVE_DECL_STRNCASECMP
 extern int strncasecmp (const char *s1, const char *s2, size_t n);
+#endif
 
 
 #ifdef __cplusplus
diff --git a/m4/strcase.m4 b/m4/strcase.m4
index 2e3d9cdcc..ae8279078 100644
--- a/m4/strcase.m4
+++ b/m4/strcase.m4
@@ -21,6 +21,7 @@ AC_DEFUN([gl_FUNC_STRCASECMP],
 AC_DEFUN([gl_FUNC_STRNCASECMP],
 [
   AC_REPLACE_FUNCS(strncasecmp)
+  AC_CHECK_DECLS(strncasecmp)
   if test $ac_cv_func_strncasecmp = no; then
     gl_PREREQ_STRNCASECMP
   fi