diff options
| author | Yang Tse <yangsita@gmail.com> | 2007-02-20 12:13:14 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2007-02-20 12:13:14 +0000 |
| commit | e268e8559ef3da2410ec9160559f607b817e0ff9 (patch) | |
| tree | c91ce2e33420556549b61abb74e8c17d8f6d111d /src/Makefile.Watcom | |
| parent | 29bb6f65f1ac786b189ca6e860b463c5142bc486 (diff) | |
curl tool was using functions curlx_tvnow and curlx_tvdiff which are not
part of the official libcurl API http://curl.haxx.se/lxr/source/lib/README.curlx
The documented way of using them would be to use timeval.c as a source code file.
The above described method works very well when statically linking libcurl and
apps, curl tool, but has several drawbacks when you build a true shared
libcurl (i.e. Name space clash at linkage stage as functions are defined more
than once. Windows makefiles are not capable of handling this system of
source-level sharing)
So...
Now curlutil.h and curlutil.c define and implement cutil_tvnow and cutil_tvdiff
which replace curlx_tvnow and curlx_tvdiff for the curl tool. Doing this we
avoid the above described problems.
Diffstat (limited to 'src/Makefile.Watcom')
| -rw-r--r-- | src/Makefile.Watcom | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 2f48f3bc6..1292ae303 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -29,7 +29,7 @@ OBJ_DIR = Watcom_obj OBJS = $(OBJ_DIR)\getpass.obj $(OBJ_DIR)\homedir.obj $(OBJ_DIR)\hugehelp.obj & $(OBJ_DIR)\main.obj $(OBJ_DIR)\urlglob.obj $(OBJ_DIR)\writeenv.obj & - $(OBJ_DIR)\writeout.obj $(OBJ_DIR)\timeval.obj + $(OBJ_DIR)\writeout.obj $(OBJ_DIR)\curlutil.obj RESOURCE = $(OBJ_DIR)\curl.res @@ -59,7 +59,7 @@ $(RESOURCE): curl.rc wrc -dCURLDEBUG=1 -q -r -zm -I..\include -fo=$@ curl.rc .ERASE -$(OBJ_DIR)\timeval.obj: ..\lib\timeval.c +$(OBJ_DIR)\curlutil.obj: curlutil.c $(CC) $[@ $(CFLAGS) -fo=$@ @echo . @@ -89,7 +89,7 @@ $(OBJ_DIR)/main.obj: main.c setup.h config-win32.h ..\lib\setup.h & ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h & urlglob.h writeout.h getpass.h homedir.h hugehelp.h version.h & ..\include\curl\curlver.h ..\lib\curlx.h ..\include\curl\mprintf.h & - ..\lib\strequal.h ..\lib\strtoofft.h ..\lib\setup.h ..\lib\timeval.h & + ..\lib\strequal.h ..\lib\strtoofft.h ..\lib\setup.h curlutil.h & ..\lib\memdebug.h $(OBJ_DIR)/urlglob.obj: urlglob.c setup.h config-win32.h ..\lib\setup.h & @@ -105,5 +105,5 @@ $(OBJ_DIR)/writeout.obj: writeout.c setup.h config-win32.h ..\lib\setup.h & ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h & ..\include\curl\mprintf.h writeout.h -$(OBJ_DIR)\timeval.obj: ..\lib\timeval.c ..\lib\timeval.h ..\lib\setup.h & +$(OBJ_DIR)\curlutil.obj: curlutil.c curlutil.h ..\lib\setup.h & ..\lib\config-win32.h |