diff options
| -rw-r--r-- | lib/Makefile.Watcom | 4 | ||||
| -rw-r--r-- | lib/Makefile.m32 | 2 | ||||
| -rw-r--r-- | lib/cookie.c | 2 | ||||
| -rw-r--r-- | lib/libcurl.rc | 4 | ||||
| -rw-r--r-- | src/Makefile.Watcom | 4 | ||||
| -rw-r--r-- | src/curl.rc | 4 |
6 files changed, 9 insertions, 11 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 965da47b5..cb7b8e969 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -11,7 +11,7 @@ CC = wcc386 CFLAGS = -3s -mf -d3 -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -bt=nt & -bd -d+ -dWIN32 -dCURL_CA_BUNDLE=getenv("CURL_CA_BUNDLE") & -dBUILDING_LIBCURL -dHAVE_SPNEGO=1 -dENABLE_IPV6 & - -dDEBUG=1 -dCURLDEBUG -d_WIN32_WINNT=0x0501 -dWINBERAPI=__declspec(cdecl) & + -dDEBUG=1 -dDEBUGBUILD -d_WIN32_WINNT=0x0501 -dWINBERAPI=__declspec(cdecl) & -dWINLDAPAPI=__declspec(cdecl) -I. -I..\include # @@ -107,7 +107,7 @@ vclean realclean: clean .SYMBOLIC .ERASE $(RESOURCE): libcurl.rc - wrc -dCURLDEBUG=1 -q -r -zm -I..\include -fo=$@ libcurl.rc + wrc -dDEBUGBUILD=1 -q -r -zm -I..\include -fo=$@ libcurl.rc .ERASE .c{$(OBJ_BASE)\dyn}.obj: diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 897dc35b9..b882735a0 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -44,7 +44,7 @@ AR = ar LDFLAGS = -s RANLIB = ranlib RC = windres -RCFLAGS = --include-dir=../include -DCURLDEBUG=0 -O COFF -i +RCFLAGS = --include-dir=../include -DDEBUGBUILD=0 -O COFF -i RM = del /q /f > NUL 2>&1 STRIP = strip -g diff --git a/lib/cookie.c b/lib/cookie.c index 32ea705e4..16b2fdd72 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -99,9 +99,7 @@ Example set of cookies: #include "rawstr.h" /* The last #include file should be: */ -#ifdef CURLDEBUG #include "memdebug.h" -#endif static void freecookie(struct Cookie *co) diff --git a/lib/libcurl.rc b/lib/libcurl.rc index 161a45df7..433deb995 100644 --- a/lib/libcurl.rc +++ b/lib/libcurl.rc @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -31,7 +31,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION RC_VERSION PRODUCTVERSION RC_VERSION FILEFLAGSMASK 0x3fL -#if defined(CURLDEBUG) || defined(_DEBUG) +#if defined(DEBUGBUILD) || defined(_DEBUG) FILEFLAGS 1 #else FILEFLAGS 0 diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index a8c66aff2..1853bcc6b 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -7,7 +7,7 @@ CC = wcc386 CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm & - -bt=nt -d+ -dWIN32 -dHAVE_STRTOLL -dCURLDEBUG -dENABLE_IPV6 & + -bt=nt -d+ -dWIN32 -dHAVE_STRTOLL -dDEBUGBUILD -dENABLE_IPV6 & -dHAVE_WINSOCK2_H -I..\include -I..\lib OBJ_DIR = WC_Win32.obj @@ -42,7 +42,7 @@ vclean realclean: clean .SYMBOLIC - rmdir $(OBJ_DIR) $(RESOURCE): curl.rc - wrc -dCURLDEBUG=1 -q -r -zm -I..\include -fo=$@ curl.rc + wrc -dDEBUGBUILD=1 -q -r -zm -I..\include -fo=$@ curl.rc .ERASE .c{$(OBJ_DIR)}.obj: diff --git a/src/curl.rc b/src/curl.rc index fd29f1836..90c070c79 100644 --- a/src/curl.rc +++ b/src/curl.rc @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -31,7 +31,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION RC_VERSION PRODUCTVERSION RC_VERSION FILEFLAGSMASK 0x3fL -#if defined(CURLDEBUG) || defined(_DEBUG) +#if defined(DEBUGBUILD) || defined(_DEBUG) FILEFLAGS 1 #else FILEFLAGS 0 |