X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtok_r.m4;h=b79c2eeee1aaabe9492f0dd4a04c4ab652f95c67;hb=6d5b64e8b1a223481ddf2fb18fc4923ed1888a66;hp=c18dc58774d5fac27b0cf2f8e3a6578270e5fb8f;hpb=1e4ece4ab9850fbfa88c9ec43ea518c7bc266792;p=gnulib.git

diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index c18dc5877..b79c2eeee 100644
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -1,13 +1,17 @@
-# strtok_r.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+# strtok_r.m4 serial 8
+dnl Copyright (C) 2002, 2003, 2004, 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRTOK_R],
 [
-  AC_REPLACE_FUNCS(strtok_r)
-  AC_CHECK_DECLS_ONCE(strtok_r)
+  dnl The strtok_r() declaration in lib/string.in.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])
   if test $ac_cv_have_decl_strtok_r = no; then
     HAVE_DECL_STRTOK_R=0
   fi
@@ -16,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])
+  :
 ])