diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-08-13 15:32:20 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-08-13 15:32:20 +0000 |
| commit | feb03e471786e9c543ef6e807a4a748046c0ce2b (patch) | |
| tree | b2c7571bd167c31f8702240a0e9c6f1fec295df5 /lib | |
| parent | 64e3a091c34482b666c3c50c312829cd7fa140c9 (diff) | |
The size of long is a build time characteristic and as such it is now recorded
in curlbuild.h as CURL_SIZEOF_LONG. Definition now done from configure process
and in CVS curlbuild.h.dist for non-configure systems.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.netware | 2 | ||||
| -rw-r--r-- | lib/config-symbian.h | 3 | ||||
| -rw-r--r-- | lib/config-tpf.h | 3 | ||||
| -rw-r--r-- | lib/strtoofft.h | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index b5025cfed..886874319 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -595,6 +595,7 @@ $(CURL_INC)/curl/curlbuild.h: Makefile.netware FORCE @echo $(DL)#ifndef __CURL_CURLBUILD_H$(DL) >> $@ @echo $(DL)#define __CURL_CURLBUILD_H$(DL) >> $@ ifeq ($(LIBARCH),LIBC) + @echo $(DL)#define CURL_SIZEOF_LONG 4$(DL) >> $@ @echo $(DL)#define CURL_OFF_T long long$(DL) >> $@ @echo $(DL)#define CURL_FMT_OFF_T "lld"$(DL) >> $@ @echo $(DL)#define CURL_FMT_OFF_TU "llu"$(DL) >> $@ @@ -603,6 +604,7 @@ ifeq ($(LIBARCH),LIBC) @echo $(DL)#define CURL_SUFFIX_CURL_OFF_T LL$(DL) >> $@ @echo $(DL)#define CURL_SUFFIX_CURL_OFF_TU ULL$(DL) >> $@ else + @echo $(DL)#define CURL_SIZEOF_LONG 4$(DL) >> $@ @echo $(DL)#define CURL_OFF_T long$(DL) >> $@ @echo $(DL)#define CURL_FMT_OFF_T "ld"$(DL) >> $@ @echo $(DL)#define CURL_FMT_OFF_TU "lu"$(DL) >> $@ diff --git a/lib/config-symbian.h b/lib/config-symbian.h index d4b5f0979..a39669c48 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -712,9 +712,6 @@ /* Define to the type of arg 5 for `select'. */ #define SELECT_TYPE_ARG5 (struct timeval *) -/* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - /* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 8 diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 70b799a3d..f8d193e17 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -593,9 +593,6 @@ /* Define to the type of arg 5 for `select'. */ #define SELECT_TYPE_ARG5 (struct timeval *) -/* The size of a `long', as computed by sizeof. */ -#define SIZEOF_LONG 8 - /* The size of a `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 8 diff --git a/lib/strtoofft.h b/lib/strtoofft.h index a9ccca017..c556404d5 100644 --- a/lib/strtoofft.h +++ b/lib/strtoofft.h @@ -41,7 +41,7 @@ * of 'long' the conversion funtion to use is strtol(). */ -#if (CURL_SIZEOF_CURL_OFF_T > SIZEOF_LONG) +#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG) # ifdef HAVE_STRTOLL # define curlx_strtoofft strtoll # else |