From cef95aadebf0be4be6b4ed82e07f38cc83faf546 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 26 Feb 2010 18:32:46 +0000 Subject: [PATCH] Added SIZEOF_INT and SIZEOF_SHORT definitions for non-configure systems --- lib/Makefile.netware | 2 ++ lib/config-amigaos.h | 3 +++ lib/config-mac.h | 3 +++ lib/config-os400.h | 6 ++++++ lib/config-riscos.h | 10 ++++++++-- lib/config-symbian.h | 6 ++++++ lib/config-tpf.h | 12 +++++++++--- lib/config-vxworks.h | 3 +++ lib/config-win32.h | 10 ++++++++-- lib/config-win32ce.h | 10 ++++++++-- lib/config.dos | 2 ++ lib/warnless.c | 2 +- src/Makefile.netware | 2 ++ src/config-amigaos.h | 3 +++ src/config-mac.h | 3 +++ src/config-riscos.h | 10 ++++++++-- src/config-win32.h | 16 ++++++++++++++++ 17 files changed, 91 insertions(+), 12 deletions(-) diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 9b105bb05..eb2cd6a3c 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -500,6 +500,8 @@ endif @echo $(DL)#define HAVE_UTIME_H 1$(DL) >> $@ @echo $(DL)#define HAVE_WRITEV 1$(DL) >> $@ @echo $(DL)#define RETSIGTYPE void$(DL) >> $@ + @echo $(DL)#define SIZEOF_INT 4$(DL) >> $@ + @echo $(DL)#define SIZEOF_SHORT 2$(DL) >> $@ @echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@ @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@ @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@ diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h index 189a0a6a0..f1a2666cd 100644 --- a/lib/config-amigaos.h +++ b/lib/config-amigaos.h @@ -85,6 +85,9 @@ #define NEED_MALLOC_H 1 +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 + #define USE_OPENSSL 1 #define USE_SSLEAY 1 #define CURL_DISABLE_LDAP 1 diff --git a/lib/config-mac.h b/lib/config-mac.h index fb2f99df3..740f1d97c 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -59,6 +59,9 @@ #define RETSIGTYPE void +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 + #define HAVE_GETNAMEINFO 1 #define GETNAMEINFO_QUAL_ARG1 const #define GETNAMEINFO_TYPE_ARG1 struct sockaddr * diff --git a/lib/config-os400.h b/lib/config-os400.h index ac75db2a2..dad4d0c35 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -349,6 +349,9 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + /* The size of a `long double', as computed by sizeof. */ #define SIZEOF_LONG_DOUBLE 8 @@ -358,6 +361,9 @@ /* The size of a `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* Whether long long constants must be suffixed by LL. */ #define HAVE_LL diff --git a/lib/config-riscos.h b/lib/config-riscos.h index a5b6850f5..98bb7880f 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -338,12 +338,18 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void -/* The size of a `long double', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long double', as computed by sizeof. */ #undef SIZEOF_LONG_DOUBLE -/* The size of a `long long', as computed by sizeof. */ +/* The size of `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/lib/config-symbian.h b/lib/config-symbian.h index 207d9040e..f5589fe78 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -709,9 +709,15 @@ /* Define to the type of arg 5 for `select'. */ #define SELECT_TYPE_ARG5 (struct timeval *) +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + /* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 8 +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* The size of `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 4 diff --git a/lib/config-tpf.h b/lib/config-tpf.h index efbd9b429..3e494f7c9 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -598,13 +598,19 @@ /* Define to the type of arg 5 for `select'. */ #define SELECT_TYPE_ARG5 (struct timeval *) -/* The size of an `off_t', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 8 -/* The size of a `size_t', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* The size of `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 8 -/* The size of a `time_t', as computed by sizeof. */ +/* The size of `time_t', as computed by sizeof. */ #define SIZEOF_TIME_T 8 /* Define to 1 if you have the ANSI C header files. */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 2d386aff0..3ad36d233 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -847,6 +847,9 @@ /* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 8 +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* The size of `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 4 diff --git a/lib/config-win32.h b/lib/config-win32.h index bc2dedf54..43997faf1 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -333,12 +333,18 @@ /* TYPE SIZES */ /* ---------------------------------------------------------------- */ -/* The number of bytes in a long double. */ +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long double', as computed by sizeof. */ #define SIZEOF_LONG_DOUBLE 16 -/* The number of bytes in a long long. */ +/* The size of `long long', as computed by sizeof. */ /* #define SIZEOF_LONG_LONG 8 */ +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* ---------------------------------------------------------------- */ /* STRUCT RELATED */ /* ---------------------------------------------------------------- */ diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index 57571b51f..058fcc0f0 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -310,12 +310,18 @@ /* TYPE SIZES */ /* ---------------------------------------------------------------- */ -/* The number of bytes in a long double. */ +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long double', as computed by sizeof. */ #define SIZEOF_LONG_DOUBLE 16 -/* The number of bytes in a long long. */ +/* The size of `long long', as computed by sizeof. */ /* #define SIZEOF_LONG_LONG 8 */ +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* ---------------------------------------------------------------- */ /* STRUCT RELATED */ /* ---------------------------------------------------------------- */ diff --git a/lib/config.dos b/lib/config.dos index b59a85ca5..e59201334 100644 --- a/lib/config.dos +++ b/lib/config.dos @@ -65,7 +65,9 @@ #define NEED_MALLOC_H 1 #define RETSIGTYPE void +#define SIZEOF_INT 4 #define SIZEOF_LONG_DOUBLE 16 +#define SIZEOF_SHORT 2 #define STDC_HEADERS 1 #define TIME_WITH_SYS_TIME 1 diff --git a/lib/warnless.c b/lib/warnless.c index 232ff8027..45ed832f6 100644 --- a/lib/warnless.c +++ b/lib/warnless.c @@ -53,7 +53,7 @@ # define CURL_MASK_UINT 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF #endif -#if (SIZEOF_LONG == 2) +#if (CURL_SIZEOF_LONG == 2) # define CURL_MASK_SLONG 0x7FFFL # define CURL_MASK_ULONG 0xFFFFUL #elif (SIZEOF_LONG == 4) diff --git a/src/Makefile.netware b/src/Makefile.netware index b47eb68e6..cd021bb6e 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -488,6 +488,8 @@ endif @echo $(DL)#define HAVE_UTIME_H 1$(DL) >> $@ @echo $(DL)#define HAVE_WRITEV 1$(DL) >> $@ @echo $(DL)#define RETSIGTYPE void$(DL) >> $@ + @echo $(DL)#define SIZEOF_INT 4$(DL) >> $@ + @echo $(DL)#define SIZEOF_SHORT 4$(DL) >> $@ @echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@ @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@ @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@ diff --git a/src/config-amigaos.h b/src/config-amigaos.h index 01cc7da18..9ca624ebb 100644 --- a/src/config-amigaos.h +++ b/src/config-amigaos.h @@ -63,5 +63,8 @@ # define LONG_MIN (-0x7fffffffL-1) /* min value for a long */ #endif +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 + #endif /* __AMIGA__ */ #endif /* CURL_CONFIG_AMIGAOS_H */ diff --git a/src/config-mac.h b/src/config-mac.h index 8f54512f2..dc7f767aa 100644 --- a/src/config-mac.h +++ b/src/config-mac.h @@ -24,6 +24,9 @@ #define TIME_WITH_SYS_TIME 1 #define HAVE_STRUCT_TIMEVAL 1 +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 + #define main(x,y) curl_main(x,y) /* we provide our own strdup prototype */ diff --git a/src/config-riscos.h b/src/config-riscos.h index 222ff6359..ba95f13d0 100644 --- a/src/config-riscos.h +++ b/src/config-riscos.h @@ -329,12 +329,18 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void -/* The size of a `long double', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long double', as computed by sizeof. */ #undef SIZEOF_LONG_DOUBLE -/* The size of a `long long', as computed by sizeof. */ +/* The size of `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/src/config-win32.h b/src/config-win32.h index 22d1c7276..7dacb55ce 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -207,6 +207,22 @@ # endif #endif +/* ---------------------------------------------------------------- */ +/* TYPE SIZES */ +/* ---------------------------------------------------------------- */ + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long double', as computed by sizeof. */ +#define SIZEOF_LONG_DOUBLE 16 + +/* The size of `long long', as computed by sizeof. */ +/* #define SIZEOF_LONG_LONG 8 */ + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + /* ---------------------------------------------------------------- */ /* STRUCT RELATED */ /* ---------------------------------------------------------------- */