From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 29 Jun 2020 15:25:45 +0000 (+0200)
Subject: Fix macro redifinition warnings in debug builds
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07ff243f07d5cca7ee842d57b391cce681b082d7;p=php

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 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"