From f954aff882601bc49337f9565863b91a5aad55c9 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Wed, 21 Apr 2021 10:43:52 +0200 Subject: [PATCH] gmacros: check that __cplusplus or _MSC_VER is defined Otherwise it will fail to compile in old distros like Centos 7 Fixes #2387 --- glib/gmacros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glib/gmacros.h b/glib/gmacros.h index 2ece48ba0..4c571083b 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -960,11 +960,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)