moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

DEBUGBUILD / CURLDEBUG decoupling follow-up

This commit is contained in:
Yang Tse 2009-06-15 02:29:49 +00:00
parent 989aace192
commit 5931cf77f4
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Makefile.Watcom
View File

@ -11,7 +11,7 @@ CC = wcc386
CFLAGS = -3s -mf -d3 -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -bt=nt & 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") & -bd -d+ -dWIN32 -dCURL_CA_BUNDLE=getenv("CURL_CA_BUNDLE") &
-dBUILDING_LIBCURL -dHAVE_SPNEGO=1 -dENABLE_IPV6 & -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 -dWINLDAPAPI=__declspec(cdecl) -I. -I..\include
# #
@ -107,7 +107,7 @@ vclean realclean: clean .SYMBOLIC
.ERASE .ERASE
$(RESOURCE): libcurl.rc $(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 .ERASE
.c{$(OBJ_BASE)\dyn}.obj: .c{$(OBJ_BASE)\dyn}.obj:

2
lib/Makefile.m32
View File

@ -44,7 +44,7 @@ AR = ar
LDFLAGS = -s LDFLAGS = -s
RANLIB = ranlib RANLIB = ranlib
RC = windres 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 RM = del /q /f > NUL 2>&1
STRIP = strip -g STRIP = strip -g

2
lib/cookie.c
View File

@ -99,9 +99,7 @@ Example set of cookies:
#include "rawstr.h" #include "rawstr.h"
/* The last #include file should be: */ /* The last #include file should be: */
#ifdef CURLDEBUG
#include "memdebug.h" #include "memdebug.h"
#endif
static void freecookie(struct Cookie *co) static void freecookie(struct Cookie *co)

4
lib/libcurl.rc
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -31,7 +31,7 @@ VS_VERSION_INFO VERSIONINFO
FILEVERSION RC_VERSION FILEVERSION RC_VERSION
PRODUCTVERSION RC_VERSION PRODUCTVERSION RC_VERSION
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#if defined(CURLDEBUG) || defined(_DEBUG) #if defined(DEBUGBUILD) || defined(_DEBUG)
FILEFLAGS 1 FILEFLAGS 1
#else #else
FILEFLAGS 0 FILEFLAGS 0

4
src/Makefile.Watcom
View File

@ -7,7 +7,7 @@
CC = wcc386 CC = wcc386
CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm & 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 -dHAVE_WINSOCK2_H -I..\include -I..\lib
OBJ_DIR = WC_Win32.obj OBJ_DIR = WC_Win32.obj
@ -42,7 +42,7 @@ vclean realclean: clean .SYMBOLIC
- rmdir $(OBJ_DIR) - rmdir $(OBJ_DIR)
$(RESOURCE): curl.rc $(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 .ERASE
.c{$(OBJ_DIR)}.obj: .c{$(OBJ_DIR)}.obj:

4
src/curl.rc
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -31,7 +31,7 @@ VS_VERSION_INFO VERSIONINFO
FILEVERSION RC_VERSION FILEVERSION RC_VERSION
PRODUCTVERSION RC_VERSION PRODUCTVERSION RC_VERSION
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#if defined(CURLDEBUG) || defined(_DEBUG) #if defined(DEBUGBUILD) || defined(_DEBUG)
FILEFLAGS 1 FILEFLAGS 1
#else #else
FILEFLAGS 0 FILEFLAGS 0