X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtok_r.m4;h=03cff09419d5f4f955692ec9c5d3e04043391ca5;hb=9e8ce574adfade2243a6141a1655addb92512aeb;hp=a354aab4ef3496139d5739cc2f3e9da3dc923efe;hpb=d4d9ba3c78eceac6e5f6755abe28f15cfece96e2;p=gnulib.git

diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index a354aab4e..03cff0941 100644
--- 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])
+  :
 ])