From b01fb30f9cf9f456be59381adbbac24fb98c30d0 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Mon, 2 Aug 2010 01:24:04 +0200
Subject: [PATCH] Moved the LDAP API defines from Makefile.Watcom to
config-win32.h.
These defines are only needed for older Watcom versions (< 1280).
---
lib/Makefile.Watcom | 1 -
lib/config-win32.h | 7 +++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index c098e5d69..1f4d075f8 100644
--- 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 7d0f8c60b..5ee76065d 100644
--- 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