aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilipp Stephani2017-06-13 09:53:33 +0200
committerPhilipp Stephani2017-06-13 09:53:33 +0200
commit9af2ab68caf7a0bf3bda521729ac0376489cce19 (patch)
tree730c81a8470e9ffe758636e78331aa233f7ce2e7 /src
parent88e0df33e0b5e854647f23fab2701094a9413fa3 (diff)
downloademacs-9af2ab68caf7a0bf3bda521729ac0376489cce19.tar.gz
emacs-9af2ab68caf7a0bf3bda521729ac0376489cce19.zip
Fix version checks for emacs-module.h
We don't need C11 or C++11 because stdbool.h is in C99, and for C++ we don't need it at all.
Diffstat (limited to 'src')
-rw-r--r--src/emacs-module.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/emacs-module.h b/src/emacs-module.h
index 313dd58d690..ad102e6d843 100644
--- a/src/emacs-module.h
+++ b/src/emacs-module.h
@@ -20,16 +20,19 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20#ifndef EMACS_MODULE_H 20#ifndef EMACS_MODULE_H
21#define EMACS_MODULE_H 21#define EMACS_MODULE_H
22 22
23#if ! (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L) \ 23#if ! (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) \
24 && ! (defined __cplusplus && __cplusplus >= 201103L) 24 && ! (defined __cplusplus && __cplusplus >= 199711L)
25# error "This file requires at least C11 or C++11" 25# error "This file requires at least C99 or C++98"
26#endif 26#endif
27 27
28#include <stdint.h> 28#include <stdint.h>
29#include <stddef.h> 29#include <stddef.h>
30
31#ifndef __cplusplus
30#include <stdbool.h> 32#include <stdbool.h>
33#endif
31 34
32#if defined __cplusplus 35#if defined __cplusplus && __cplusplus >= 201103L
33# define EMACS_NOEXCEPT noexcept 36# define EMACS_NOEXCEPT noexcept
34#else 37#else
35# define EMACS_NOEXCEPT 38# define EMACS_NOEXCEPT