Added SIZEOF_INT and SIZEOF_SHORT definitions for non-configure systems

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 9b105bb05e412e10cef4550f7a05814a5b28f4ff..eb2cd6a3ce47c0a92ad51ec2039c7ccf0b8978b2 100644 (file)
--- 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 189a0a6a0a8a4ff158dbb800ae81a08ea1c556f3..f1a2666cdadeee4e4eb141a9558bc136f78b8405 100644 (file)
--- 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 fb2f99df303b93a54db96b144b043dca5a8faa06..740f1d97c287d1b912a6ac2ffa561bad7bbfcd3a 100644 (file)
--- 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 ac75db2a26ebd3f148770a08729d09778b7d51c1..dad4d0c355d9a70c6e66d6602d66caa12acce4c2 100644 (file)
--- 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 a5b6850f5ed8e99c9b486e3d83d57fb8241f863a..98bb7880f43b6d823532371609afda212afb347c 100644 (file)
--- 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 207d9040e4bc460445f194d66681f496c467e980..f5589fe784ab45a3f7204ddc067150b0bef5c8f5 100644 (file)
--- 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 efbd9b4299dc9f730ad40b3d3f5f927b62a84187..3e494f7c93cb88890d49e086dd37f5ee3acdb00b 100644 (file)
--- 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 2d386aff067926b3d0a93d06531f8405496486c1..3ad36d233df63126ba797718161bbfcc932f0cb4 100644 (file)
--- 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 bc2dedf54127e199d5a0533041d875ea395ae9bd..43997faf1a4a4438c06b876dee2a85a1f331aede 100644 (file)
--- 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 57571b51ffdc50bcd3273d8eafb5a4d9576abef6..058fcc0f0b7b3962bef3bfdbd3fc0165b429cc06 100644 (file)
--- 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 b59a85ca589d16a0e1ac49e32a721a844cee3956..e5920133401d917f96152acc2b6a6cec1274a962 100644 (file)
--- 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 232ff8027e47566901b9efbd1389574db6a49ed3..45ed832f62dd5b62ef4d453d58da426046c7ecba 100644 (file)
--- 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 b47eb68e6e8542bfe163f8b576ab6890eac0d83b..cd021bb6e99a93daeb22b94c46fb4ac292b13163 100644 (file)
--- 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 01cc7da183797edefd21543b119d1f2f4290864e..9ca624ebb8dde48664992eb6529bc38b842e7825 100644 (file)
--- 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 8f54512f21e7c01fdbd7cfd0572d9b68bff9af65..dc7f767aa7661fcea26e6584ddc9ac32a5c8e2a9 100644 (file)
--- 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 222ff635939be5401fea99f3b02870a7436a4365..ba95f13d033187a70142fdb607e0f4a49df50798 100644 (file)
--- 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 22d1c7276525447ef4d95e8c30739d3b7f693ba9..7dacb55ce461c4fd7213a3954df5e0c277687dcc 100644 (file)
--- 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                          */
 /* ---------------------------------------------------------------- */