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.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index b7ea2d8b1..29efaec37 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -11,7 +11,7 @@
 ## Updated by: Craig Davison <cd@securityfocus.com>

 ## release-ssl added by Miklos Nemeth <mnemeth@kfkisystems.com>

 ## winmm.lib added by Miklos Nemeth <mnemeth@kfkisystems.com> to support

-## timeGetTime() in timeval.c

+## timeGetTime() in curlutil.c

 

 PROGRAM_NAME = curl.exe

 

@@ -77,7 +77,7 @@ RELEASE_OBJS= \
 	urlglobr.obj \

 	getpassr.obj \

 	homedirr.obj \

-	timevalr.obj \

+	curlutilr.obj \

 	strtoofftr.obj \

 	mainr.obj \

 	curlr.res

@@ -88,7 +88,7 @@ DEBUG_OBJS= \
 	urlglobd.obj \

 	getpassd.obj \

 	homedird.obj \

-	timevald.obj \

+	curlutild.obj \

 	strtoofftd.obj \

 	maind.obj \

 	curld.res

@@ -221,8 +221,8 @@ getpassr.obj: getpass.c
 	$(CCR) $(CFLAGS) /Fo"$@" getpass.c

 homedirr.obj: homedir.c

 	$(CCR) $(CFLAGS) /Fo"$@" homedir.c

-timevalr.obj: ../lib/timeval.c

-	$(CCR) $(CFLAGS) /Fo"$@" ../lib/timeval.c

+curlutilr.obj: curlutil.c

+	$(CCR) $(CFLAGS) /Fo"$@" curlutil.c

 strtoofftr.obj: ../lib/strtoofft.c

 	$(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c

 mainr.obj: main.c

@@ -241,8 +241,8 @@ getpassd.obj: getpass.c
 	$(CCD) $(CFLAGS) /Fo"$@" getpass.c

 homedird.obj: homedir.c

 	$(CCD) $(CFLAGS) /Fo"$@" homedir.c

-timevald.obj: ../lib/timeval.c

-	$(CCD) $(CFLAGS) /Fo"$@" ../lib/timeval.c

+curlutild.obj: curlutil.c

+	$(CCD) $(CFLAGS) /Fo"$@" curlutil.c

 strtoofftd.obj: ../lib/strtoofft.c

 	$(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c

 maind.obj: main.c