diff options
| author | Philipp Stephani <phst@google.com> | 2017-06-13 09:53:33 +0200 |
|---|---|---|
| committer | Philipp Stephani <phst@google.com> | 2017-06-13 09:53:33 +0200 |
| commit | 9af2ab68caf7a0bf3bda521729ac0376489cce19 (patch) | |
| tree | 730c81a8470e9ffe758636e78331aa233f7ce2e7 | |
| parent | 88e0df33e0b5e854647f23fab2701094a9413fa3 (diff) | |
| download | emacs-9af2ab68caf7a0bf3bda521729ac0376489cce19.tar.gz | |
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.
| -rw-r--r-- | src/emacs-module.h | 11 |
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/>. */ #ifndef EMACS_MODULE_H #define EMACS_MODULE_H -#if ! (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L) \ - && ! (defined __cplusplus && __cplusplus >= 201103L) -# error "This file requires at least C11 or C++11" +#if ! (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) \ + && ! (defined __cplusplus && __cplusplus >= 199711L) +# error "This file requires at least C99 or C++98" #endif #include <stdint.h> #include <stddef.h> + +#ifndef __cplusplus #include <stdbool.h> +#endif -#if defined __cplusplus +#if defined __cplusplus && __cplusplus >= 201103L # define EMACS_NOEXCEPT noexcept #else # define EMACS_NOEXCEPT |