Commit 3360d5bf authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

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
parent 92013487

include/ap_ldap.hnw

+1 −22
Original line number Diff line number Diff line
@@ -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

include/ap_ldap.hw

+1 −22
Original line number Diff line number Diff line
@@ -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

modules/ldap/mod_ldap.dsp

+0 −44
Original line number Diff line number Diff line
@@ -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