diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-08-07 00:29:08 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-08-07 00:29:08 +0000 |
| commit | 14240e9e109fe6af19438c6531d573f85dbb0b1e (patch) | |
| tree | 61c5713bff289fbdc27e019b71427723bfb78dbc /src | |
| parent | a3045b4e4944a36f467f363607d6c6a50727fca2 (diff) | |
Initial support of curlbuild.h and curlrules.h which allows
to have a curl_off_t data type no longer gated to off_t.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.Watcom | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/Makefile.netware | 1 | ||||
| -rw-r--r-- | src/setup.h | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 942443848..ea84c8aac 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -8,7 +8,7 @@ CC = wcc386 CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm & -bt=nt -d+ -dWIN32 -dHAVE_STRTOLL & - -dSIZEOF_CURL_OFF_T=8 -dCURLDEBUG -dENABLE_IPV6 -dHAVE_WINSOCK2_H & + -dCURLDEBUG -dENABLE_IPV6 -dHAVE_WINSOCK2_H & -I..\include -I..\lib OBJ_DIR = WC_Win32.obj diff --git a/src/Makefile.am b/src/Makefile.am index 1d0235a77..59a97f808 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,16 +27,18 @@ AUTOMAKE_OPTIONS = foreign nostdinc # being currently built and tested are searched before the library which # might possibly already be installed in the system. # +# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file # $(top_srcdir)/include is for libcurl's external include files # $(top_builddir)/lib is for libcurl's generated lib/config.h file # $(top_builddir)/src is for curl's generated src/config.h file # $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files # $(top_srcdir)/src is for curl's src/setup.h and "curl-private" files -INCLUDES = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/lib \ +INCLUDES = -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/src bin_PROGRAMS = curl diff --git a/src/Makefile.netware b/src/Makefile.netware index 3f9d67a3e..168e53edf 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -459,7 +459,6 @@ endif @echo $(DL)#define HAVE_UTIME 1$(DL) >> $@ @echo $(DL)#define HAVE_UTIME_H 1$(DL) >> $@ @echo $(DL)#define RETSIGTYPE void$(DL) >> $@ - @echo $(DL)#define SIZEOF_CURL_OFF_T 4$(DL) >> $@ @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@ @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@ ifdef DISABLE_LDAP diff --git a/src/setup.h b/src/setup.h index 348c8de79..4f0835e3c 100644 --- a/src/setup.h +++ b/src/setup.h @@ -187,10 +187,6 @@ int fileno( FILE *stream); #include <sys/timeval.h> #endif -#ifndef SIZEOF_CURL_OFF_T -#define SIZEOF_CURL_OFF_T sizeof(curl_off_t) -#endif - #ifndef UNPRINTABLE_CHAR /* define what to use for unprintable characters */ #define UNPRINTABLE_CHAR '.' |