summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-06-29 17:25:45 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-06-29 19:11:22 +0200
commit07ff243f07d5cca7ee842d57b391cce681b082d7 (patch)
treebe4f87448ba94b195d8bcd9f39a0571b90160044
parentbf6720d582de512fb6a8dd42c8515bc14e0953c5 (diff)
downloadphp-git-07ff243f07d5cca7ee842d57b391cce681b082d7.tar.gz
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>
-rw-r--r--ext/ldap/ldap.c1
-rw-r--r--win32/readdir.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 4c3e69f762..1fbfbf59a4 100644
--- 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 c172f16fc2..efa7bd5966 100644
--- 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"