Fix clash of strncasecmp prototypes in C++ mode.

diff --git a/ChangeLog b/ChangeLog
index 0bdba7f099101e51de70e610583ffff50ba8a94c..b975ac76c4937a8f95625f10bd8019b099d9f2f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/lib/strcase.h b/lib/strcase.h
index fa5a68dc1e54dc29d5e13d75a1aa08820d1dd11c..07d4c9a42bb99a929b8985b7dafcc09fa2d66545 100644 (file)
--- 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 2e3d9cdcc5434c109dce19a208f3981ce8c8fd9f..ae8279078605ad159fc0eacb967ecee7356f51ef 100644 (file)
--- 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