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.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Makefile.inc') diff --git a/src/Makefile.inc b/src/Makefile.inc index b6583e72c..1ebbd0dfe 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -2,15 +2,15 @@ # libcurl has sources that provide functions named curlx_* that aren't part of # the official API, but we re-use the code here to avoid duplication. -CURLX_ONES = $(top_srcdir)/lib/strtoofft.c $(top_srcdir)/lib/timeval.c \ +CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \ $(top_srcdir)/lib/strdup.c CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c \ - getpass.c homedir.c + getpass.c homedir.c curlutil.c CURL_HFILES = hugehelp.h setup.h config-win32.h config-mac.h \ config-riscos.h urlglob.h version.h \ - writeout.h writeenv.h getpass.h homedir.h + writeout.h writeenv.h getpass.h homedir.h curlutil.h curl_SOURCES = $(CURL_SOURCES) $(CURLX_ONES) $(CURL_HFILES) -- cgit v1.2.3