romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-05 20:06:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl tool was using functions curlx_tvnow and curlx_tvdiff which are not

Browse source 
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.
This commit is contained in:
Yang Tse 2007-02-20 12:13:14 +00:00
parent 29bb6f65f1
commit e268e8559e
9 changed files with 194 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Makefile.Watcom
View file

@ -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