Add 'restrict' module.

diff --git a/ChangeLog b/ChangeLog
index 529f1186dfe93f0d2c13f8776730716c3d94094f..8ed6f44608520407b59e021c6f0c4068bfec42ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-07 Paul Eggert  <eggert@twinsun.com>
+
+       * modules/restrict: New file.
+       * MODULES.html.sh (func_all_modules): Add restrict.
+       * modules/regex: Depend on restrict.
+       
 2003-08-07  Bruno Haible  <bruno@clisp.org>
 
        * modules/getndelim2 (Makefile.am): Add the files to EXTRA_DIST, not

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 639313003022d3044cdc988c40fbbd75f15a852a..11cc04c8e011e40dcc3b845bd6ed99a0a606f19f 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1593,6 +1593,16 @@ func_all_modules ()
   func_wrap H2
   func_echo "$element"
 
+  element="Keywords"
+  element=`printf "%s" "$element" | sed -e "$sed_lt" -e "$sed_gt"`
+  func_section_wrap isoc_sup_keywords
+  func_wrap H3
+  func_echo "$element"
+
+  func_begin_table
+  func_module restrict
+  func_end_table
+
   element="Boolean type and values <stdbool.h>"
   element=`printf "%s" "$element" | sed -e "$sed_lt" -e "$sed_gt"`
   func_section_wrap isoc_sup_stdbool

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 80c1e29fe2a2dc76e2c254fdf87d3eb0af8d23f2..2db9e8e7da63b0cc08f2afd27fc5311fe6151165 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-07  Paul Eggert  <eggert@twinsun.com>
+
+       * restrict.m4: New file.
+       * regex.m4 (jm_PREREQ_REGEX): Add gl_C_RESTRICT.
+
 2003-08-07  Bruno Haible  <bruno@clisp.org>
 
        * getndelim2.m4 (gl_GETNDELIM2): Use AC_LIBOBJ(getndelim2). This makes

diff --git a/m4/regex.m4 b/m4/regex.m4
index 24355ac6904d59f2b514845e6375c8b51f438390..98c6509c8afe26b54a6cba4b2be29d4ae47e10c4 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 17
+#serial 18
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
@@ -110,6 +110,7 @@ AC_DEFUN([jm_PREREQ_REGEX],
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  AC_REQUIRE([gl_C_RESTRICT])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS_ONCE(limits.h string.h wchar.h wctype.h)

diff --git a/m4/restrict.m4 b/m4/restrict.m4
new file mode 100644 (file)
index 0000000..6342938
--- /dev/null
+++ b/m4/restrict.m4
@@ -0,0 +1,33 @@
+#serial 1002
+# This macro can be removed once we can rely on Autoconf 2.57a or later,
+# since we can then use its AC_C_RESTRICT.
+
+# gl_C_RESTRICT
+# --------------
+# Determine whether the C/C++ compiler supports the "restrict" keyword
+# introduced in ANSI C99, or an equivalent.  Do nothing if the compiler
+# accepts it.  Otherwise, if the compiler supports an equivalent,
+# define "restrict" to be that.  Here are some variants:
+# - GCC supports both __restrict and __restrict__
+# - older DEC Alpha C compilers support only __restrict
+# - _Restrict is the only spelling accepted by Sun WorkShop 6 update 2 C
+# Otherwise, define "restrict" to be empty.
+AC_DEFUN([gl_C_RESTRICT],
+[AC_CACHE_CHECK([for C/C++ restrict keyword], gl_cv_c_restrict,
+  [gl_cv_c_restrict=no
+   # Try the official restrict keyword, then gcc's __restrict, and
+   # the less common variants.
+   for ac_kw in restrict __restrict __restrict__ _Restrict; do
+     AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+      [float * $ac_kw x;])],
+      [gl_cv_c_restrict=$ac_kw; break])
+   done
+  ])
+ case $gl_cv_c_restrict in
+   restrict) ;;
+   no) AC_DEFINE(restrict,,
+       [Define to equivalent of C99 restrict keyword, or to nothing if this
+       is not supported.  Do not define if restrict is supported directly.]) ;;
+   *)  AC_DEFINE_UNQUOTED(restrict, $gl_cv_c_restrict) ;;
+ esac
+])

diff --git a/modules/regex b/modules/regex
index d71081a61200088e85ec99502731e449b7e77a9c..ba53fa0557148d57e1f2c496885e8a9432a441b9 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -10,6 +10,7 @@ Depends-on:
 alloca
 unlocked-io
 gettext
+restrict
 
 configure.ac:
 gl_REGEX

diff --git a/modules/restrict b/modules/restrict
new file mode 100644 (file)
index 0000000..b03c0d6
--- /dev/null
+++ b/modules/restrict
@@ -0,0 +1,17 @@
+Description:
+The C99 'restrict' keyword.
+
+Files:
+m4/restrict.m4
+
+Depends-on:
+
+configure.ac:
+gl_C_RESTRICT
+
+Makefile.am:
+
+Include:
+
+Maintainer:
+Paul Eggert and Jim Meyering