diff options
| author | Ignacio Casal Quinteiro <qignacio@amazon.com> | 2021-04-21 10:43:52 +0200 |
|---|---|---|
| committer | Ignacio Casal Quinteiro <qignacio@amazon.com> | 2021-04-22 17:35:05 +0200 |
| commit | 603051d17fa861b8b09bfe781e0b09d533daf08b (patch) | |
| tree | b1a775ab0746b7ffd42247ef8cd59d57f5ae8773 | |
| parent | 80a938a205774b985aea38a421cde176e71f6c73 (diff) | |
| download | glib-nacho/gmacros-master.tar.gz | |
gmacros: check that __cplusplus or _MSC_VER is definednacho/gmacros-master
Otherwise it will fail to compile in old distros like Centos 7
| -rw-r--r-- | glib/gmacros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/gmacros.h b/glib/gmacros.h index e2f49e381..5b3b265c2 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -1044,11 +1044,11 @@ /* For compatibility with G_NORETURN_FUNCPTR on clang, use __attribute__((__noreturn__)), not _Noreturn. */ # define G_NORETURN __attribute__ ((__noreturn__)) -#elif 1200 <= _MSC_VER +#elif defined (_MSC_VER) && (1200 <= _MSC_VER) /* Use MSVC specific syntax. */ # define G_NORETURN __declspec (noreturn) /* Use ISO C++11 syntax when the compiler supports it. */ -#elif (__cplusplus >= 201103 && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) || (_MSC_VER >= 1900) +#elif (defined (__cplusplus) && __cplusplus >= 201103 && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) || defined (_MSC_VER) && (_MSC_VER >= 1900) # define G_NORETURN [[noreturn]] /* Use ISO C11 syntax when the compiler supports it. */ #elif __STDC_VERSION__ >= 201112 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) |