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.
This commit is contained in:
@@ -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) >> $@
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user