diff options
| author | Yuan Fu <casouri@gmail.com> | 2022-10-05 14:22:03 -0700 |
|---|---|---|
| committer | Yuan Fu <casouri@gmail.com> | 2022-10-05 14:22:03 -0700 |
| commit | 7ebbd4efc3d45403cf845d35c36c21756baeeba8 (patch) | |
| tree | f53223ce7dbd64c079aced6e1a77964d1a8eaa3f /src/lisp.h | |
| parent | cb183f6467401fb5ed2b7fc98ca75be9d943cbe3 (diff) | |
| parent | 95efafb72664049f8ac825047df3645656cf76f4 (diff) | |
| download | emacs-7ebbd4efc3d45403cf845d35c36c21756baeeba8.tar.gz emacs-7ebbd4efc3d45403cf845d35c36c21756baeeba8.tar.bz2 emacs-7ebbd4efc3d45403cf845d35c36c21756baeeba8.zip | |
Merge branch 'master' into feature/tree-sitter
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h index 0281c483e32..1e41e2064c9 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -245,7 +245,8 @@ DEFINE_GDB_SYMBOL_BEGIN (EMACS_INT, VALMASK) DEFINE_GDB_SYMBOL_END (VALMASK) /* Ignore 'alignas' on compilers lacking it. */ -#if !defined alignas && !defined __alignas_is_defined +#if (!defined alignas && !defined __alignas_is_defined \ + && __STDC_VERSION__ < 202311 && __cplusplus < 201103) # define alignas(a) #endif |