aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-03-10 08:08:02 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-03-10 08:08:02 +0000
commit22f4d81f3e6712cb4fc07f33e902cc7382c2212b (patch)
tree5f9d67712e54e7c2a3fc41f803214f8faf119c7e /lib
parent0d1f80ccb508460788f371b64f1d7b0da99e9e8b (diff)
Make sure SIZEOF_CURL_OFF_T is defined before we check for it being > 4.
It is only undefined when this file is included by others (like ares) and in those cases it doesn't matter.
Diffstat (limited to 'lib')
-rw-r--r--lib/setup.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/setup.h b/lib/setup.h
index 64073204f..1c9c16fd3 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -81,8 +81,15 @@ typedef unsigned char bool;
#endif
#endif /* HAVE_LONGLONG */
+#ifndef SIZEOF_CURL_OFF_T
+/* If we don't know the size here, we assume a conservative size: 4. When
+ building libcurl, the actual size of this variable should be define in the
+ config*.h file. */
+#define SIZEOF_CURL_OFF_T 4
+#endif
+
/* We set up our internal prefered (CURL_)FORMAT_OFF_T here */
-#if defined(SIZEOF_CURL_OFF_T) && (SIZEOF_CURL_OFF_T > 4)
+#if SIZEOF_CURL_OFF_T > 4
#define FORMAT_OFF_T "lld"
#else
#define FORMAT_OFF_T "ld"
@@ -273,10 +280,6 @@ typedef struct hostent Curl_addrinfo;
typedef struct in_addr Curl_ipconnect;
#endif
-#ifndef SIZEOF_CURL_OFF_T
-#define SIZEOF_CURL_OFF_T sizeof(curl_off_t)
-#endif
-
#ifdef VMS
#define IOCTL_3_ARGS
#endif