Revert r1129891:

    LDAP_DECLARE Header adjustment for nw/win32

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150168 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_ldap.hnw b/include/ap_ldap.hnw
index 151b003170e5adb3e6459c248e12ebf7438cf5aa..52aac34b45043708b8d87897894711139fd25984 100644 (file)
--- a/include/ap_ldap.hnw
+++ b/include/ap_ldap.hnw
@@ -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 
 

diff --git a/include/ap_ldap.hw b/include/ap_ldap.hw
index 36e21abd860bf836f9ee89d311f564fea9758c41..097ba472a7e960edb4d71c1698bf947d651255e4 100644 (file)
--- a/include/ap_ldap.hw
+++ b/include/ap_ldap.hw
@@ -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

diff --git a/modules/ldap/mod_ldap.dsp b/modules/ldap/mod_ldap.dsp
index 7918f2cd3623020f08330af5a4708d6465af34c9..db087575c1e19601fe384f09024eb1476545dd94 100644 (file)
--- a/modules/ldap/mod_ldap.dsp
+++ b/modules/ldap/mod_ldap.dsp
@@ -100,50 +100,6 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(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