diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-08-07 17:40:56 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-08-07 17:40:56 +0000 |
| commit | 10203cada98918bb9db42a2cb210dc63fb6c1aa3 (patch) | |
| tree | d465482e7e9582c1452f0e08faeb8d769c67ade3 | |
| parent | 58b0415d36d6a29f6865360c4862644d5c8bcb3c (diff) | |
moved HAVE_LONGLONG from makefiles to config-win32.h.
| -rw-r--r-- | lib/Makefile.Watcom | 2 | ||||
| -rw-r--r-- | lib/Makefile.m32 | 2 | ||||
| -rw-r--r-- | lib/config-win32.h | 5 | ||||
| -rw-r--r-- | src/Makefile.Watcom | 2 | ||||
| -rw-r--r-- | src/config-win32.h | 5 |
5 files changed, 13 insertions, 3 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index d34b750c5..8301925e9 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -9,7 +9,7 @@ TARGETS = libcurl_wc.lib libcurl_wc.dll libcurl_wc_imp.lib CC = wcc386 CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -bt=nt -bd & - -d+ -dWIN32 -dHAVE_LONGLONG -dCURL_CA_BUNDLE=getenv("CURL_CA_BUNDLE") & + -d+ -dWIN32 -dCURL_CA_BUNDLE=getenv("CURL_CA_BUNDLE") & -dBUILDING_LIBCURL -dWITHOUT_MM_LIB -dHAVE_SPNEGO=1 -dENABLE_IPV6 & -dDEBUG_THREADING_GETADDRINFO -dDEBUG=1 -dCURLDEBUG -d_WIN32_WINNT=0x0501 & -I. -I..\include diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index d2ccf02b2..d8c15ce23 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -35,7 +35,7 @@ STRIP = strip -g ## Nothing more to do below this line! INCLUDES = -I. -I../include -CFLAGS = -g -O2 -DBUILDING_LIBCURL -DHAVE_LONGLONG +CFLAGS = -g -O2 -DBUILDING_LIBCURL ifdef ARES INCLUDES += -I$(ARES_LIB) CFLAGS += -DUSE_ARES diff --git a/lib/config-win32.h b/lib/config-win32.h index 7520d2973..67375e0c9 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -346,6 +346,11 @@ #define HAVE_VARIADIC_MACROS_C99 1 #endif +/* Define if the compiler supports LONGLONG. */ +#if defined(__MINGW32__) || defined(__WATCOMC__) +#define HAVE_LONGLONG 1 +#endif + /* ---------------------------------------------------------------- */ /* LDAP LIBRARY FILES */ /* ---------------------------------------------------------------- */ diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 2486cf87f..4c6b27308 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -13,7 +13,7 @@ STATIC = 0 CC = wcc386 CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm & - -bt=nt -d+ -dWIN32 -dHAVE_LONGLONG -dHAVE_STRTOLL -dWITHOUT_MM_LIB & + -bt=nt -d+ -dWIN32 -dHAVE_STRTOLL -dWITHOUT_MM_LIB & -dSIZEOF_CURL_OFF_T=8 -dCURLDEBUG -dENABLE_IPV6 -dHAVE_WINSOCK2_H & -I..\include -I..\lib diff --git a/src/config-win32.h b/src/config-win32.h index 734d575a8..90ce7d6d8 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -180,6 +180,11 @@ #define HAVE_VARIADIC_MACROS_C99 1 #endif +/* Define if the compiler supports LONGLONG. */ +#if defined(__MINGW32__) || defined(__WATCOMC__) +#define HAVE_LONGLONG 1 +#endif + /* ---------------------------------------------------------------- */ /* ADDITIONAL DEFINITIONS */ /* ---------------------------------------------------------------- */ |