diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2023-01-13 19:32:47 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2023-01-13 20:03:54 -0800 |
commit | 99120491730c5839a5ba15ded187d481af1e71a7 (patch) | |
tree | 8473e9b735fdc25d01fa5dc65ae2884250b23d89 /m4/assert_h.m4 | |
parent | dce42f556177e4e0f15daccb3c2f27a47f2beebb (diff) | |
download | emacs-99120491730c5839a5ba15ded187d481af1e71a7.tar.gz |
Update from Gnulib by running admin/merge-gnulib
This adds a new file m4/xattr.m4 from Gnulib,
for NFS v4 attribute copying.
Also, do these changes by hand:
* configure.ac: Mention $LIB_XATTR" in ACL summary.
* src/Makefile.in (QCOPY_ACL_LIB): New macro.
(LIBES): Use it.
Diffstat (limited to 'm4/assert_h.m4')
-rw-r--r-- | m4/assert_h.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/assert_h.m4 b/m4/assert_h.m4 index 6275f633a69..3801452ef0d 100644 --- a/m4/assert_h.m4 +++ b/m4/assert_h.m4 @@ -18,7 +18,7 @@ AC_DEFUN([gl_ASSERT_H], [AC_LANG_PROGRAM( [[#if defined __clang__ && __STDC_VERSION__ < 202311 #pragma clang diagnostic error "-Wc2x-extensions" - #pragma clang diagnostic error "-Wc++17-extensions" + #pragma clang diagnostic error "-Wc++1z-extensions" #endif #ifdef INCLUDE_ASSERT_H #include <assert.h> @@ -60,7 +60,7 @@ AC_DEFUN([gl_ASSERT_H], /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments. We need it also to be invocable with a single argument. */ #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus - #undef static_assert + #undef/**/static_assert #define static_assert _Static_assert #endif #endif]) |