Merge pull request #110 from Jan-E/win32-stdint

[Windows] Fix PHP 8+ compatibility
websupport-sk · May 4, 2023 · f15988d · f15988d
2 parents 218e617 + 7e7fb52
commit f15988d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/memcache_binary_protocol.c b/src/memcache_binary_protocol.c
@@ -26,12 +26,16 @@
 #define MMC_DEBUG 0
 
 #ifdef PHP_WIN32
-#include <win32/php_stdint.h>
-#include <winsock2.h>
+# if defined(_MSC_VER) && _MSC_VER < 1920
+#  include "win32/php_stdint.h"
+# else
+#  include <stdint.h>
+# endif
+# include <winsock2.h>
 #else
-#include <stdint.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
+# include <stdint.h>
+# include <arpa/inet.h>
+# include <netinet/in.h>
 #endif
 #include "memcache_pool.h"
 #include "ext/standard/php_smart_string.h"

diff --git a/src/memcache_pool.h b/src/memcache_pool.h
@@ -35,9 +35,13 @@
 #endif
 
 #ifdef PHP_WIN32
-#include <win32/php_stdint.h>
+# if defined(_MSC_VER) && _MSC_VER < 1920
+#  include "win32/php_stdint.h"
+# else
+#  include <stdint.h>
+# endif
 #else
-#include <stdint.h>
+# include <stdint.h>
 #endif
 #include <string.h>