Revamp lchown so that it lives in unistd.h where it belongs.

[pspp] / m4 / mempcpy.m4

diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index efb2eb05b4080fdd789a9f28d76893c40abd90df..9e854e81ee0243e66c453e3df5e6e2a0b79d0e25 100644 (file)
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,4 +1,4 @@
-# mempcpy.m4 serial 5
+# mempcpy.m4 serial 7
 dnl Copyright (C) 2003, 2004, 2006, 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,10 +6,13 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMPCPY],
 [
-
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  dnl The mempcpy() declaration in lib/string_.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REPLACE_FUNCS(mempcpy)
   if test $ac_cv_func_mempcpy = no; then
     HAVE_MEMPCPY=0