Mercurial > hg > octave-nkf > gnulib-hg
changeset 8814:04b21457982b
Ensure AC_C_RESTRICT is invoked.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 13 May 2007 21:57:40 +0000 |
parents | dcdd75ded626 |
children | 61554edc2407 |
files | ChangeLog m4/stpcpy.m4 m4/stpncpy.m4 m4/strsep.m4 m4/strtok_r.m4 |
diffstat | 5 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +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
--- 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 @@ 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
--- 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 @@ 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
--- 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 @@ 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
--- 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 @@ 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 @@ # Prerequisites of lib/strtok_r.c. AC_DEFUN([gl_PREREQ_STRTOK_R], [ - AC_REQUIRE([AC_C_RESTRICT]) + : ])