Ensure AC_C_RESTRICT is invoked.

diff --git a/ChangeLog b/ChangeLog
index efaf8a1..cb62048 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-05-13  Bruno Haible  <bruno@clisp.org>
 
+       * stpcpy.m4 (gl_FUNC_STPCPY): Require AC_C_RESTRICT.
+       * stpncpy.m4 (gl_FUNC_STPNCPY): Likewise.
+       * strsep.m4 (gl_FUNC_STRSEP): Likewise.
+       * strtok_r.m4 (gl_FUNC_STRTOK_R): Likewise.
+       (gl_PREREQ_STRTOK_R): Don't require it here.
+
+2007-05-13  Bruno Haible  <bruno@clisp.org>
+
        * lib/stdlib_.h (mkdtemp, mkstemp): Comment out argument name. Needed
        when used in C++ mode.
 

diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index d42196e..c48aa9c 100644 (file)
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -1,4 +1,4 @@
-# stpcpy.m4 serial 3
+# stpcpy.m4 serial 4
 dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,9 @@ AC_DEFUN([gl_FUNC_STPCPY],
   dnl Persuade glibc <string.h> to declare stpcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  dnl The stpcpy() declaration in lib/string_.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REPLACE_FUNCS(stpcpy)
   if test $ac_cv_func_stpcpy = no; then

diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index 7e15186..aad0375 100644 (file)
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -1,4 +1,4 @@
-# stpncpy.m4 serial 6
+# stpncpy.m4 serial 7
 dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,9 @@ AC_DEFUN([gl_FUNC_STPNCPY],
   dnl Persuade glibc <string.h> to declare stpncpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  dnl The stpncpy() declaration in lib/string_.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
 
   dnl Both glibc and AIX (4.3.3, 5.1) have an stpncpy() function

diff --git a/m4/strsep.m4 b/m4/strsep.m4
index 6073adb..0abbf08 100644 (file)
--- a/m4/strsep.m4
+++ b/m4/strsep.m4
@@ -1,4 +1,4 @@
-# strsep.m4 serial 5
+# strsep.m4 serial 6
 dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,9 @@ AC_DEFUN([gl_FUNC_STRSEP],
   dnl Persuade glibc <string.h> to declare strsep().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  dnl The strsep() declaration in lib/string_.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REPLACE_FUNCS(strsep)
   if test $ac_cv_func_strsep = no; then

diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index a354aab..03cff09 100644 (file)
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -1,4 +1,4 @@
-# strtok_r.m4 serial 5
+# strtok_r.m4 serial 6
 dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,6 +6,9 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRTOK_R],
 [
+  dnl The strtok_r() declaration in lib/string_.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REPLACE_FUNCS(strtok_r)
   AC_CHECK_DECLS_ONCE(strtok_r)
@@ -17,5 +20,5 @@ AC_DEFUN([gl_FUNC_STRTOK_R],
 
 # Prerequisites of lib/strtok_r.c.
 AC_DEFUN([gl_PREREQ_STRTOK_R], [
-  AC_REQUIRE([AC_C_RESTRICT])
+  :
 ])