Feature test macros depending on __GNUC__

Smithsonian · Jan 12, 2025 · e0dbde4 · e0dbde4
1 parent 4f85172
commit e0dbde4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/smax-messages.c b/src/smax-messages.c
@@ -11,12 +11,10 @@
 
 // We'll use gcc major version as a proxy for the glibc library to decide which feature macro to use.
 // gcc 5.1 was released 2015-04-22...
-#ifndef __GNUC__
-#  define _ISOC99_SOURCE        ///< vsnprintf() feature macro starting glibc 2.20 (2014-09-08)
-#elif __GNUC__ >= 5
-#  define _ISOC99_SOURCE        ///< vsnprintf() feature macro starting glibc 2.20 (2014-09-08)
-#else
+#if defined (__GNUC__) && (__GNUC__ < 5)
 #  define _BSD_SOURCE           ///< vsnprinf() feature macro for glibc <= 2.19
+#else
+#  define _ISOC99_SOURCE        ///< vsnprintf() feature macro starting glibc 2.20 (2014-09-08)
 #endif
 
 #include <stdarg.h>

diff --git a/src/smax-util.c b/src/smax-util.c
@@ -13,12 +13,10 @@
 
 // We'll use gcc major version as a proxy for the glibc library to decide which feature macro to use.
 // gcc 5.1 was released 2015-04-22...
-#ifndef __GNUC__
-#  define _ISOC99_SOURCE        ///< strtoll() feature macro starting glibc 2.20 (2014-09-08)
-#elif __GNUC__ >= 5
-#  define _ISOC99_SOURCE        ///< strtoll() feature macro starting glibc 2.20 (2014-09-08)
-#else
+#if __GNUC__ > 0 && __GNUC__ < 5
 #  define _BSD_SOURCE           ///< strtoll() feature macro for glibc <= 2.19
+#else
+#  define _ISOC99_SOURCE        ///< strtoll() feature macro starting glibc 2.20 (2014-09-08)
 #endif
 
 #include <stdio.h>