From 5db68d2033bff8a0d8709f75f7eed2833a4b1b28 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 6 Jan 2014 12:04:25 +0000 Subject: [PATCH] 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 --- STATUS | 4 ---- include/util_ldap.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/STATUS b/STATUS index cf3bd95096..7d75c55384 100644 --- 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 2db507f5b6..c7f7827370 100644 --- 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 -- 2.40.0