diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-09-14 04:44:46 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-10-20 16:05:19 +0200 |
| commit | 6e3046f7ae479a1d9b946ae8b0bea12277771650 (patch) | |
| tree | a1218bbd35294038bc766ae211cb4e51b21e34f1 | |
| parent | 6ce4984fdd6bc24dc5149cb3f6bec36d4f6b3cf1 (diff) | |
| download | glib-c-cxx-std-versions.tar.gz | |
gmacros: Use G_C_STD_CHECK_VERSION to define C-std dependent itemsc-cxx-std-versions
| -rw-r--r-- | glib/gmacros.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/glib/gmacros.h b/glib/gmacros.h index a110f42db..b2e39a49e 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -110,18 +110,18 @@ /* Every compiler that we target supports inlining, but some of them may * complain about it if we don't say "__inline". If we have C99, or if * we are using C++, then we can use "inline" directly. Unfortunately - * Visual Studio does not support __STDC_VERSION__, so we need to check - * whether we are on Visual Studio 2013 or earlier to see that we need to - * say "__inline" in C mode. + * Visual Studio does not define __STDC_VERSION__ (if not using /std:cXX), + * so we need to check whether we are on Visual Studio 2013 or earlier to see + * that we need to say "__inline" in C mode. * Otherwise, we say "__inline" to avoid the warning. */ #define G_CAN_INLINE -#ifndef G_CXX_STD_VERSION +#ifdef G_C_STD_VERSION # ifdef _MSC_VER # if (_MSC_VER < 1900) # define G_INLINE_DEFINE_NEEDED # endif -# elif !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199900) +# elif !G_C_STD_CHECK_VERSION (99) # define G_INLINE_DEFINE_NEEDED # endif #endif @@ -862,8 +862,8 @@ #ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */ #define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2 #define G_PASTE(identifier1,identifier2) G_PASTE_ARGS (identifier1, identifier2) -#if !defined(G_CXX_STD_VERSION) && defined(__STDC_VERSION__) && \ - (__STDC_VERSION__ >= 201112L || g_macro__has_feature(c_static_assert) || g_macro__has_extension(c_static_assert)) +#if (G_C_STD_CHECK_VERSION (11) || \ + g_macro__has_feature(c_static_assert) || g_macro__has_extension(c_static_assert)) #define G_STATIC_ASSERT(expr) _Static_assert (expr, "Expression evaluates to false") #elif G_CXX_STD_CHECK_VERSION (11) #define G_STATIC_ASSERT(expr) static_assert (expr, "Expression evaluates to false") @@ -873,7 +873,7 @@ #else #define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __LINE__)[(expr) ? 1 : -1] G_GNUC_UNUSED #endif -#endif /* __STDC_VERSION__ */ +#endif /* G_C_STD_CHECK_VERSION (11) */ #define G_STATIC_ASSERT_EXPR(expr) ((void) sizeof (char[(expr) ? 1 : -1])) #endif /* !__GI_SCANNER__ */ @@ -887,7 +887,7 @@ /* Provide a string identifying the current function, non-concatenatable */ #if defined (__GNUC__) && defined (G_CXX_STD_VERSION) #define G_STRFUNC ((const char*) (__PRETTY_FUNCTION__)) -#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#elif G_C_STD_CHECK_VERSION (99) #define G_STRFUNC ((const char*) (__func__)) #elif defined (__GNUC__) || (defined(_MSC_VER) && (_MSC_VER > 1300)) #define G_STRFUNC ((const char*) (__FUNCTION__)) @@ -1015,8 +1015,7 @@ * * Since: 2.60 */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \ - !defined(G_CXX_STD_VERSION) +#if G_C_STD_CHECK_VERSION (11) #define G_ALIGNOF(type) _Alignof (type) \ GLIB_AVAILABLE_MACRO_IN_2_60 #else @@ -1079,7 +1078,7 @@ /* Use MSVC specific syntax. */ # define G_NORETURN __declspec (noreturn) /* Use ISO C11 syntax when the compiler supports it. */ -#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112 +#elif G_C_STD_CHECK_VERSION (11) # define G_NORETURN _Noreturn #else # define G_NORETURN /* empty */ |