diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2023-08-12 12:50:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2023-08-12 12:57:35 -0700 |
| commit | f3868cb9d1806b35186eabc0262393316ebe689a (patch) | |
| tree | b94176760150b6994aacf74292a12ba0890b9222 /m4/stdalign.m4 | |
| parent | b66c16c789d8046ff40c48b9346b26238b1b97e1 (diff) | |
| download | emacs-f3868cb9d1806b35186eabc0262393316ebe689a.tar.gz | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'm4/stdalign.m4')
| -rw-r--r-- | m4/stdalign.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 1a236d66d2f..6a39ffe7565 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -68,8 +68,10 @@ AC_DEFUN([gl_ALIGNASOF], dnl The "zz" puts this toward config.h's end, to avoid potential dnl collisions with other definitions. AH_VERBATIM([zzalignas], -[#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof -# if HAVE_STDALIGN_H +[#if !defined HAVE_C_ALIGNASOF \ + && !(defined __cplusplus && 201103 <= __cplusplus) \ + && !defined alignof +# if defined HAVE_STDALIGN_H # include <stdalign.h> # endif @@ -166,7 +168,7 @@ AC_DEFUN([gl_ALIGNASOF], # define _Alignas(a) __declspec (align (a)) # endif # endif -# if !HAVE_STDALIGN_H +# if !defined HAVE_STDALIGN_H # if ((defined _Alignas \ && !(defined __cplusplus \ && (201103 <= __cplusplus || defined _MSC_VER))) \ @@ -175,7 +177,7 @@ AC_DEFUN([gl_ALIGNASOF], # endif # endif -# if _GL_STDALIGN_NEEDS_STDDEF +# if defined _GL_STDALIGN_NEEDS_STDDEF # include <stddef.h> # endif #endif]) |