From 8fdf481b7fed08cb6abe008f4a0f19684fff787f Mon Sep 17 00:00:00 2001 From: "ted.mielczarek@gmail.com" Date: Thu, 7 Mar 2013 19:02:44 +0000 Subject: fix size types w/x32 A=vapier@chromium.org R=ted at https://breakpad.appspot.com/526002/ BUG=chromium-os:36866 TEST=compiled the code for x86_64 (64bit) & x86_64 (x32) git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1129 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/third_party/curl/curlbuild.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/third_party/curl/curlbuild.h b/src/third_party/curl/curlbuild.h index bab11ac9..648cf02d 100644 --- a/src/third_party/curl/curlbuild.h +++ b/src/third_party/curl/curlbuild.h @@ -154,7 +154,7 @@ #endif /* The size of `long', as computed by sizeof. */ -#if defined(_M_X64) || defined(__x86_64__) +#if defined(_M_X64) || (defined(__x86_64__) && !defined(__ILP32__)) #define CURL_SIZEOF_LONG 8 #else #define CURL_SIZEOF_LONG 4 @@ -170,7 +170,7 @@ typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; /* Signed integral data type used for curl_off_t. */ -#if defined(_M_X64) || defined(__x86_64__) +#if defined(_M_X64) || (defined(__x86_64__) && !defined(__ILP32__)) #define CURL_TYPEOF_CURL_OFF_T long #else #define CURL_TYPEOF_CURL_OFF_T int64_t -- cgit v1.2.1