aboutsummaryrefslogtreecommitdiffstats
path: root/lib/curl_setup.h
diff options
context:
space:
mode:
authorBertrand SIMONNET <bsimonnet@google.com>2015-07-09 11:05:09 -0700
committerBertrand SIMONNET <bsimonnet@google.com>2015-07-09 16:29:59 -0700
commit8eb97d044bca094e812492eb49a5cc1790cf1296 (patch)
tree517e658ceab73e16b9dc6f194a8518699002b480 /lib/curl_setup.h
parentf551028d5caab29d4b4a4ae8c159c76c3cfd4887 (diff)
downloadandroid_external_curl-8eb97d044bca094e812492eb49a5cc1790cf1296.tar.gz
android_external_curl-8eb97d044bca094e812492eb49a5cc1790cf1296.tar.bz2
android_external_curl-8eb97d044bca094e812492eb49a5cc1790cf1296.zip
Don't rely on hardcoded type size.
Instead of hard coding the type size computed in configure (which prevents cross compilation), use either the type sizes defined by bionic or sizeof instruction. BUG: 22347561 Change-Id: Ia1d8ba914e2f410754d0bd49618956d19d517d25
Diffstat (limited to 'lib/curl_setup.h')
-rw-r--r--lib/curl_setup.h32
1 files changed, 0 insertions, 32 deletions
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index ab0c139..df8b1e7 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -393,33 +393,6 @@
#endif
/*
- * Default sizeof(off_t) in case it hasn't been defined in config file.
- */
-
-#ifndef SIZEOF_OFF_T
-# if defined(__VMS) && !defined(__VAX)
-# if defined(_LARGEFILE)
-# define SIZEOF_OFF_T 8
-# endif
-# elif defined(__OS400__) && defined(__ILEC400__)
-# if defined(_LARGE_FILES)
-# define SIZEOF_OFF_T 8
-# endif
-# elif defined(__MVS__) && defined(__IBMC__)
-# if defined(_LP64) || defined(_LARGE_FILES)
-# define SIZEOF_OFF_T 8
-# endif
-# elif defined(__370__) && defined(__IBMC__)
-# if defined(_LP64) || defined(_LARGE_FILES)
-# define SIZEOF_OFF_T 8
-# endif
-# endif
-# ifndef SIZEOF_OFF_T
-# define SIZEOF_OFF_T 4
-# endif
-#endif
-
-/*
* Arg 2 type for gethostname in case it hasn't been defined in config file.
*/
@@ -597,11 +570,6 @@ int netware_init(void);
#define USE_LIBIDN
#endif
-#ifndef SIZEOF_TIME_T
-/* assume default size of time_t to be 32 bit */
-#define SIZEOF_TIME_T 4
-#endif
-
#define LIBIDN_REQUIRED_VERSION "0.4.1"
#if defined(USE_GNUTLS) || defined(USE_OPENSSL) || defined(USE_NSS) || \