diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-17 09:16:48 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-17 09:16:48 +0800 |
| commit | bb95cdaa0693ecea2953d14f2808a23b66ac9446 (patch) | |
| tree | 0baff93b05b3d75ce7cec9f491ea7c687942adb5 /m4 | |
| parent | bb8bf9203ed33de0bb269c8ff69067aa7b3a692a (diff) | |
| parent | 6cb963b73c3768958e13e96b2534d1e99239a3ff (diff) | |
| download | emacs-bb95cdaa0693ecea2953d14f2808a23b66ac9446.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-common.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index edb8572da25..a2b53d33dca 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 86 +# gnulib-common.m4 serial 87 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -1053,6 +1053,7 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS], dnl -Wno-float-conversion >= 4.9 >= 3.9 dnl -Wno-float-equal >= 3 >= 3.9 dnl -Wimplicit-fallthrough >= 7 >= 3.9 + dnl -Wno-missing-field-initializers >= 4.0, < 11 dnl -Wno-pedantic >= 4.8 >= 3.9 dnl -Wno-sign-compare >= 3 >= 3.9 dnl -Wno-sign-conversion >= 4.3 >= 3.9 @@ -1078,6 +1079,9 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS], #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wimplicit-fallthrough #endif + #if __GNUC__ >= 4 && __GNUC__ < 11 && !defined __clang__ + -Wno-missing-field-initializers + #endif #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) -Wno-pedantic #endif |