merge r1551802 from trunk:

mod_ldap: restrict a recent WIN32 change to only apply when the MS SDK is used.

Submitted by: covener:
Reviewed by: jim, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555722 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index cf3bd95096331fc427b98231193507146fe87282..7d75c553849373b7569eb60d60cf20760fbc5aa9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -98,10 +98,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_ldap: restrict a recent WIN32 change to only apply when the MS SDK is used
-    trunk patch: http://svn.apache.org/r1551802
-    2.4.x patch: trunk works
-    +1 covener, jim, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/include/util_ldap.h b/include/util_ldap.h
index 2db507f5b6b4508774a863cfba5ac5f9e2f902a7..c7f782737033bdfcf2094f260bf057c6fe1fc93d 100644 (file)
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -83,7 +83,7 @@
 #define LDAP_DECLARE_DATA             __declspec(dllimport)
 #endif
 
-#ifdef WIN32
+#if APR_HAS_MICROSOFT_LDAPSDK
 #define timeval l_timeval
 #endif