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.inc | |
parent | 29bb6f65f1ac786b189ca6e860b463c5142bc486 (diff) | |
download | curl-e268e8559ef3da2410ec9160559f607b817e0ff9.tar.gz |
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.inc')
-rw-r--r-- | src/Makefile.inc | 6 |
1 files changed, 3 insertions, 3 deletions
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) |