From e268e8559ef3da2410ec9160559f607b817e0ff9 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 20 Feb 2007 12:13:14 +0000 Subject: 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. --- src/makefile.dj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/makefile.dj') diff --git a/src/makefile.dj b/src/makefile.dj index 9e1287eae..8e0d22802 100644 --- a/src/makefile.dj +++ b/src/makefile.dj @@ -60,6 +60,8 @@ realclean vclean: clean - rm -f $(PROGRAM) hugehelp.c # DO NOT DELETE THIS LINE +djgpp/curlutil.o: curlutil.c setup.h config.h ../lib/config.dj ../lib/setup.h \ + ../lib/config.h curlutil.h djgpp/getpass.o: getpass.c setup.h config.h ../lib/config.dj ../lib/setup.h \ ../lib/config.h getpass.h djgpp/homedir.o: homedir.c setup.h config.h ../lib/config.dj ../lib/setup.h \ @@ -72,7 +74,7 @@ djgpp/main.o: main.c setup.h config.h ../lib/config.dj ../lib/setup.h \ ../include/curl/easy.h ../include/curl/multi.h urlglob.h writeout.h \ getpass.h homedir.h hugehelp.h writeenv.h version.h ../lib/curlx.h \ ../include/curl/mprintf.h ../lib/strequal.h ../lib/strtoofft.h \ - ../lib/timeval.h ../lib/memdebug.h ../lib/memory.h + curlutil.h ../lib/memdebug.h ../lib/memory.h djgpp/urlglob.o: urlglob.c setup.h config.h ../lib/config.dj ../lib/setup.h \ ../lib/config.h ../include/curl/curl.h ../include/curl/curlver.h \ ../include/curl/easy.h ../include/curl/multi.h \ -- cgit v1.2.3