diff options
| author | Guenter Knauf <lists@gknw.net> | 2010-08-02 01:24:04 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2010-08-02 01:28:46 +0200 |
| commit | b01fb30f9cf9f456be59381adbbac24fb98c30d0 (patch) | |
| tree | 5daaf179b9ad3db52bc1b4d9747ce14e56164937 | |
| parent | f38e52071e19dc16cf59c1719f37ec555b4c75b5 (diff) | |
| download | curl-b01fb30f9cf9f456be59381adbbac24fb98c30d0.tar.gz | |
Moved the LDAP API defines from Makefile.Watcom to config-win32.h.
These defines are only needed for older Watcom versions (< 1280).
| -rw-r--r-- | lib/Makefile.Watcom | 1 | ||||
| -rw-r--r-- | lib/config-win32.h | 7 |
2 files changed, 7 insertions, 1 deletions
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 |