stpncpy: Allow stpncpy to be defined as a macro.

diff --git a/ChangeLog b/ChangeLog
index d86bbc37e457ba215fdabe589f1623bb7d57a966..86de94dde635abce597a0d1a0ed06347cd38798f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-15  Bruno Haible  <bruno@clisp.org>
+
+       stpncpy: Allow stpncpy to be defined as a macro.
+       * m4/stpncpy.m4 (gl_FUNC_STPNCPY): Don't attempt to redeclare stpncpy
+       if it's already correctly declared.
+       * lib/string.in.h (stpncpy): Undefine before redefining.
+       Reported by Jeremy Huddleston <jeremyhu@macports.org>.
+
 2010-08-14  Bruno Haible  <bruno@clisp.org>
 
        Rename module 'memxfrm' to 'amemxfrm'.

diff --git a/lib/string.in.h b/lib/string.in.h
index fb737700627e6176996493604203a728289c4b06..bb6aa58e2f9053ec02a178033db84a1f807c1be1 100644 (file)
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -233,6 +233,7 @@ _GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - "
 #if @GNULIB_STPNCPY@
 # if @REPLACE_STPNCPY@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef stpncpy
 #   define stpncpy rpl_stpncpy
 #  endif
 _GL_FUNCDECL_RPL (stpncpy, char *,

diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index d2344acc4a51ee06862732f893070c26778fd27d..158cc087d9e6af70e004b353dc9a694199e77f6c 100644 (file)
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -1,4 +1,4 @@
-# stpncpy.m4 serial 11
+# stpncpy.m4 serial 12
 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -25,6 +25,7 @@ AC_DEFUN([gl_FUNC_STPNCPY],
   dnl   in AIX:     dest + max(0,n-1)
   dnl Only the glibc return value is useful in practice.
 
+  AC_CHECK_DECLS_ONCE([stpncpy])
   AC_CHECK_FUNCS_ONCE([stpncpy])
   if test $ac_cv_func_stpncpy = yes; then
     AC_CACHE_CHECK([for working stpncpy], [gl_cv_func_stpncpy], [
@@ -32,7 +33,9 @@ AC_DEFUN([gl_FUNC_STPNCPY],
 #include <stdlib.h>
 #include <string.h> /* for strcpy */
 /* The stpncpy prototype is missing in <string.h> on AIX 4.  */
+#if !HAVE_DECL_STPNCPY
 extern char *stpncpy (char *dest, const char *src, size_t n);
+#endif
 int main () {
   const char *src = "Hello";
   char dest[10];