Merge pull request NoiseByNorthwest#328 from NoiseByNorthwest/fix_326

Switch to c11

Author: NoiseByNorthwest

config.m4

@@ -19,7 +19,16 @@ if test "$PHP_SPX" = "yes"; then
     AC_DEFINE_UNQUOTED([SPX_HTTP_UI_ASSETS_DIR], [ "$PHP_SPX_ASSETS_DIR/web-ui" ], [path of web-ui assets directory])
     PHP_SUBST([PHP_SPX_ASSETS_DIR])
 
-    CFLAGS="$CFLAGS -Werror -Wall -Wno-attributes -O3 -pthread -std=gnu90"
+    CFLAGS="$CFLAGS -Werror -Wall -Wno-attributes -O3 -pthread"
+
+    php_ver_num=$(echo $PHP_VERSION | awk -F. '{printf("%d%02d%02d",$1,$2,$3)}')
+    if test "$php_ver_num" -ge 80200; then
+        CFLAGS="$CFLAGS -std=c11"
+        AC_MSG_NOTICE([Adding -std=c11 because PHP >= 8.2])
+    else
+        CFLAGS="$CFLAGS -std=gnu90"
+        AC_MSG_NOTICE([Adding -std=gnu90 because PHP < 8.2])
+    fi
 
     # Disabling typedef-redefinition is required for:
     #   - macOS, see https://github.com/NoiseByNorthwest/php-spx/pull/270

src/php_spx.h

@@ -23,7 +23,7 @@
 #include "main/php.h"
 
 /* linux 2.6+ or OSX */
-#if !defined(linux) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__FreeBSD__)
+#if !defined(__linux__) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__FreeBSD__)
 #   error "Only Linux-based OSes, Apple MacOS and FreeBSD are supported"
 #endif
 

src/spx_resource_stats.c

@@ -16,7 +16,7 @@
  */
 
 
-#if defined(linux)
+#if defined(__linux__)
 #   include "spx_resource_stats-linux.c"
 #elif defined(__APPLE__) && defined(__MACH__)
 #   include "spx_resource_stats-macos.c"