Moved the LDAP API defines from Makefile.Watcom to config-win32.h.

These defines are only needed for older Watcom versions (< 1280).

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index c098e5d697075232c5c932f84a81c73421bb9215..1f4d075f8e3460416f5345b75e6a58ea3cb2db6e 100644 (file)
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -32,7 +32,6 @@ CP = copy
 CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm &
          -wcd=201 -bt=nt -d+ -dWIN32 -dCURL_WANTS_CA_BUNDLE_ENV         &
          -dBUILDING_LIBCURL -dHAVE_SPNEGO=1 -I. -I..\include $(SYS_INCL)
-#CFLAGS += -dWINBERAPI=__declspec(cdecl) -dWINLDAPAPI=__declspec(cdecl)
 
 !ifdef %debug
 DEBUG  = -dDEBUG=1 -dDEBUGBUILD

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 7d0f8c60bcdcff5ccef9332b16c3104eaf2d4294..5ee76065d87da188df5c9deb43a9426bbbef2c7b 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -550,6 +550,13 @@
 #define CURL_LDAP_WIN 1
 #endif
 
+#if defined(__WATCOMC__) && defined(CURL_LDAP_WIN)
+#if __WATCOMC__ < 1280
+#define WINBERAPI  __declspec(cdecl)
+#define WINLDAPAPI __declspec(cdecl)
+#endif
+#endif
+
 #if defined(__POCC__) && defined(CURL_LDAP_WIN)
 #  define CURL_DISABLE_LDAP 1
 #endif