svn commit: r1555722 - in /httpd/httpd/branches/2.4.x: ./ STATUS include/util_ldap.h

[tr...@apache.org]

Author: trawick
Date: Mon Jan  6 12:04:25 2014
New Revision: 1555722

URL: http://svn.apache.org/r1555722
Log:
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


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/include/util_ldap.h

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1551802

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1555722&r1=1555721&r2=1555722&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jan  6 12:04:25 2014
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/util_ldap.h?rev=1555722&r1=1555721&r2=1555722&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/util_ldap.h (original)
+++ httpd/httpd/branches/2.4.x/include/util_ldap.h Mon Jan  6 12:04:25 2014
@@ -83,7 +83,7 @@
 #define LDAP_DECLARE_DATA             __declspec(dllimport)
 #endif
 
-#ifdef WIN32
+#if APR_HAS_MICROSOFT_LDAPSDK
 #define timeval l_timeval
 #endif