>From 771be1d4d16c54578e9605c3d457290b822bcfa5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 23 Feb 2020 12:19:28 +0100 Subject: [PATCH 07/29] memcoll: Use 'restrict'. * lib/memcoll.h (memcoll): Use 'restrict'. * m4/memcoll.m4 (gl_MEMCOLL): Require AC_C_RESTRICT. --- ChangeLog | 4 ++++ lib/memcoll.h | 2 +- m4/memcoll.m4 | 8 ++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5154229..b1ffa89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2020-02-23 Bruno Haible + memcoll: Use 'restrict'. + * lib/memcoll.h (memcoll): Use 'restrict'. + * m4/memcoll.m4 (gl_MEMCOLL): Require AC_C_RESTRICT. + vasnprintf: Use 'restrict'. * lib/vasnprintf.h (asnprintf, vasnprintf): Use 'restrict'. * modules/vasnprintf (configure.ac): Require AC_C_RESTRICT. diff --git a/lib/memcoll.h b/lib/memcoll.h index add0968..907ca1f 100644 --- a/lib/memcoll.h +++ b/lib/memcoll.h @@ -22,7 +22,7 @@ # include -int memcoll (char *, size_t, char *, size_t); +int memcoll (char *restrict, size_t, char *restrict, size_t); int memcoll0 (char const *, size_t, char const *, size_t); #endif /* MEMCOLL_H_ */ diff --git a/m4/memcoll.m4 b/m4/memcoll.m4 index d3d1132..e6eb77e 100644 --- a/m4/memcoll.m4 +++ b/m4/memcoll.m4 @@ -1,8 +1,12 @@ -# memcoll.m4 serial 10 +# memcoll.m4 serial 11 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2020 Free Software Foundation, dnl 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_MEMCOLL], [:]) +AC_DEFUN([gl_MEMCOLL], +[ + AC_REQUIRE([AC_C_RESTRICT]) + : +]) -- 2.7.4