@@ -1,3 +1,7 @@

+Wed Jan 30 22:52:54 EET 2008 (edwin)

+------------------------------------

+ * configure.in,configure: add AC_C_RESTRICT (bb #452)

+

 Wed Jan 30 22:42:39 EET 2008 (edwin)

 ------------------------------------

  * build system modernization: (based on suggestion from

@@ -390,5 +390,9 @@

 /* Define to `long int' if <sys/types.h> does not define. */

 #undef off_t

+/* Define to equivalent of C99 restrict keyword, or to nothing if this is not

+   supported. Do not define if restrict is supported directly. */

+#undef restrict

+

 /* Define to "int" if <sys/socket.h> does not define. */

 #undef socklen_t

@@ -10215,6 +10215,81 @@ _ACEOF

 fi

+{ echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5

+echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6; }

+if test "${ac_cv_c_restrict+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  ac_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

+     cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+typedef int * int_ptr;

+        int foo (int_ptr $ac_kw ip) {

+        return ip[0];

+       }

+int

+main ()

+{

+int s[1];

+        int * $ac_kw t = s;

+        t[0] = 0;

+        return foo(t)

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext

+if { (ac_try="$ac_compile"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_compile") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

+  ac_cv_c_restrict=$ac_kw

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+     test "$ac_cv_c_restrict" != no && break

+   done

+

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5

+echo "${ECHO_T}$ac_cv_c_restrict" >&6; }

+ case $ac_cv_c_restrict in

+   restrict) ;;

+   no)

+cat >>confdefs.h <<\_ACEOF

+#define restrict

+_ACEOF

+ ;;

+   *)  cat >>confdefs.h <<_ACEOF

+#define restrict $ac_cv_c_restrict

+_ACEOF

+ ;;

+ esac

+

 # Check whether --enable-gcc-vcheck was given.

 if test "${enable_gcc_vcheck+set}" = set; then

@@ -64,6 +64,7 @@ AC_DEFINE(SCANBUFF, 131072, [scan buffer size])

 AC_DEFINE(FILEBUFF, 8192,   [file i/o buffer size])

 AC_HEADER_STDC

+AC_C_RESTRICT

 AC_ARG_ENABLE(gcc-vcheck,

 [  --disable-gcc-vcheck	  do not check for buggy gcc version ],