Fix macro redifinition warnings in debug builds

MSVC considers these warnings[1] to be severe (level 1), so we better
fix the respective code.

[1] <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4005?view=vs-2019>

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 4c3e69f762a59a3e0487a0a0654c7b708555a2cf..1fbfbf59a466e813adbe3ace9e759d6bdb7efb23 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -38,7 +38,6 @@
 #ifdef PHP_WIN32
 #include <string.h>
 #include "config.w32.h"
-#define strdup _strdup
 #undef WINDOWS
 #undef strcasecmp
 #undef strncasecmp

diff --git a/win32/readdir.c b/win32/readdir.c
index c172f16fc2d7d0ba1ea950f07011679354a25815..efa7bd59663d465966025c3fba45dbaa29df5efc 100644 (file)
--- a/win32/readdir.c
+++ b/win32/readdir.c
@@ -1,8 +1,9 @@
+#include "php.h"
+
 #include <malloc.h>
 #include <string.h>
 #include <errno.h>
 
-#include "php.h"
 #include "readdir.h"
 #include "win32/ioutil.h"