diff options
| author | Bertrand SIMONNET <bsimonnet@google.com> | 2015-07-09 11:05:09 -0700 |
|---|---|---|
| committer | Bertrand SIMONNET <bsimonnet@google.com> | 2015-07-09 16:29:59 -0700 |
| commit | 8eb97d044bca094e812492eb49a5cc1790cf1296 (patch) | |
| tree | 517e658ceab73e16b9dc6f194a8518699002b480 /include | |
| parent | f551028d5caab29d4b4a4ae8c159c76c3cfd4887 (diff) | |
| download | android_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 'include')
| -rw-r--r-- | include/curl/curlbuild.h.in | 3 | ||||
| -rw-r--r-- | include/curl/curlrules.h | 14 |
2 files changed, 0 insertions, 17 deletions
diff --git a/include/curl/curlbuild.h.in b/include/curl/curlbuild.h.in index e29f195..7cb2b6e 100644 --- a/include/curl/curlbuild.h.in +++ b/include/curl/curlbuild.h.in @@ -158,9 +158,6 @@ # include <sys/poll.h> #endif -/* The size of `long', as computed by sizeof. */ -#undef CURL_SIZEOF_LONG - /* Integral data type used for curl_socklen_t. */ #undef CURL_TYPEOF_CURL_SOCKLEN_T diff --git a/include/curl/curlrules.h b/include/curl/curlrules.h index 7c2ede3..1163e95 100644 --- a/include/curl/curlrules.h +++ b/include/curl/curlrules.h @@ -75,11 +75,6 @@ * Verify that some macros are actually defined. */ -#ifndef CURL_SIZEOF_LONG -# error "CURL_SIZEOF_LONG definition is missing!" - Error Compilation_aborted_CURL_SIZEOF_LONG_is_missing -#endif - #ifndef CURL_TYPEOF_CURL_SOCKLEN_T # error "CURL_TYPEOF_CURL_SOCKLEN_T definition is missing!" Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_is_missing @@ -134,15 +129,6 @@ #define CurlchkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1 /* - * Verify that the size previously defined and expected for long - * is the same as the one reported by sizeof() at compile time. - */ - -typedef char - __curl_rule_01__ - [CurlchkszEQ(long, CURL_SIZEOF_LONG)]; - -/* * Verify that the size previously defined and expected for * curl_off_t is actually the the same as the one reported * by sizeof() at compile time. |