aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-03-07 19:02:44 +0000
committerted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-03-07 19:02:44 +0000
commit8fdf481b7fed08cb6abe008f4a0f19684fff787f (patch)
treed234c535b19ea39e7b2358e4028359aea507b327 /src
parentProvide a ReadSymbolData API for Mac dump_syms (diff)
downloadbreakpad-8fdf481b7fed08cb6abe008f4a0f19684fff787f.tar.xz
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
Diffstat (limited to 'src')
-rw-r--r--src/third_party/curl/curlbuild.h4
1 files changed, 2 insertions, 2 deletions
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