httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1150168 - in /httpd/httpd/branches/revert-ap-ldap: include/ap_ldap.hnw include/ap_ldap.hw modules/ldap/mod_ldap.dsp
Date Sat, 23 Jul 2011 17:19:56 GMT
Author: sf
Date: Sat Jul 23 17:19:55 2011
New Revision: 1150168

URL: http://svn.apache.org/viewvc?rev=1150168&view=rev
Log:
Revert r1129891:

    LDAP_DECLARE Header adjustment for nw/win32


Modified:
    httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hnw
    httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hw
    httpd/httpd/branches/revert-ap-ldap/modules/ldap/mod_ldap.dsp

Modified: httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hnw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hnw?rev=1150168&r1=1150167&r2=1150168&view=diff
==============================================================================
--- httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hnw (original)
+++ httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hnw Sat Jul 23 17:19:55 2011
@@ -19,7 +19,7 @@
  */
 /**
  * @file ap_ldap.h
- * @brief  LDAP 
+ * @brief  MODLDAP 
  */
 #ifndef AP_LDAP_H
 #define AP_LDAP_H
@@ -30,27 +30,6 @@
  * @{
  */
 
-/* Create a set of LDAP_DECLARE macros with appropriate export 
- * and import tags for the platform
- */
-#if !defined(WIN32)
-#define LDAP_DECLARE(type)            type
-#define LDAP_DECLARE_NONSTD(type)     type
-#define LDAP_DECLARE_DATA
-#elif defined(LDAP_DECLARE_STATIC)
-#define LDAP_DECLARE(type)            type __stdcall
-#define LDAP_DECLARE_NONSTD(type)     type
-#define LDAP_DECLARE_DATA
-#elif defined(LDAP_DECLARE_EXPORT)
-#define LDAP_DECLARE(type)            __declspec(dllexport) type __stdcall
-#define LDAP_DECLARE_NONSTD(type)     __declspec(dllexport) type
-#define LDAP_DECLARE_DATA             __declspec(dllexport)
-#else
-#define LDAP_DECLARE(type)            __declspec(dllimport) type __stdcall
-#define LDAP_DECLARE_NONSTD(type)     __declspec(dllimport) type
-#define LDAP_DECLARE_DATA             __declspec(dllimport)
-#endif
-
 /* this will be defined if LDAP support was compiled into apr-util */
 #define AP_HAS_LDAP                1 
 

Modified: httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hw?rev=1150168&r1=1150167&r2=1150168&view=diff
==============================================================================
--- httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hw (original)
+++ httpd/httpd/branches/revert-ap-ldap/include/ap_ldap.hw Sat Jul 23 17:19:55 2011
@@ -30,29 +30,8 @@
  * @{
  */
 
-/* Create a set of LDAP_DECLARE macros with appropriate export 
- * and import tags for the platform
- */
-#if !defined(WIN32)
-#define LDAP_DECLARE(type)            type
-#define LDAP_DECLARE_NONSTD(type)     type
-#define LDAP_DECLARE_DATA
-#elif defined(LDAP_DECLARE_STATIC)
-#define LDAP_DECLARE(type)            type __stdcall
-#define LDAP_DECLARE_NONSTD(type)     type
-#define LDAP_DECLARE_DATA
-#elif defined(LDAP_DECLARE_EXPORT)
-#define LDAP_DECLARE(type)            __declspec(dllexport) type __stdcall
-#define LDAP_DECLARE_NONSTD(type)     __declspec(dllexport) type
-#define LDAP_DECLARE_DATA             __declspec(dllexport)
-#else
-#define LDAP_DECLARE(type)            __declspec(dllimport) type __stdcall
-#define LDAP_DECLARE_NONSTD(type)     __declspec(dllimport) type
-#define LDAP_DECLARE_DATA             __declspec(dllimport)
-#endif
-
 /* this will be defined if LDAP support was compiled into apr-util */
-#define AP_HAS_LDAP		   1
+#define AP_HAS_LDAP		    0
 
 /* identify the LDAP toolkit used */
 #define AP_HAS_NETSCAPE_LDAPSDK    0

Modified: httpd/httpd/branches/revert-ap-ldap/modules/ldap/mod_ldap.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/revert-ap-ldap/modules/ldap/mod_ldap.dsp?rev=1150168&r1=1150167&r2=1150168&view=diff
==============================================================================
--- httpd/httpd/branches/revert-ap-ldap/modules/ldap/mod_ldap.dsp (original)
+++ httpd/httpd/branches/revert-ap-ldap/modules/ldap/mod_ldap.dsp Sat Jul 23 17:19:55 2011
@@ -100,50 +100,6 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # Name "mod_ldap - Win32 Release"
 # Name "mod_ldap - Win32 Debug"
 # Begin Source File
-SOURCE=.\include\ap_ldap.hw
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/ap_ldap.h
-InputPath=.\include\ap_ldap.hw
-
-".\include\ap_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\ap_ldap.hw > .\include\ap_ldap.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/ap_ldap.h
-InputPath=.\include\ap_ldap.hw
-
-".\include\ap_ldap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\ap_ldap.hw > .\include\ap_ldap.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ap_ldap_init.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ap_ldap_option.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ap_ldap_rebind.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ap_ldap_url.c
-# End Source File
-# Begin Source File
 
 SOURCE=.\util_ldap.c
 # End Source File



Mime
View raw message