From 63e1f060a267c8355fa8d24b8b9af149c620893f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 18 May 2016 14:10:36 +0200 Subject: [PATCH] curlbuild.h.dist: check __LP64__ as well to fix MIPS build The preprocessor check that sets up the 32bit defines for non-configure builds didn't work properly for MIPS systems as __mips__ is defined for both 32bit and 64bit. Now __LP64__ is also checked and indicates 64bit. Reported-by: Tomas Jakobsson Fixes #813 --- include/curl/curlbuild.h.dist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist index 58323d064..ae95095fa 100644 --- a/include/curl/curlbuild.h.dist +++ b/include/curl/curlbuild.h.dist @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -527,9 +527,9 @@ /* ===================================== */ #elif defined(__GNUC__) -# if defined(__ILP32__) || \ +# if !defined(__LP64__) && (defined(__ILP32__) || \ defined(__i386__) || defined(__ppc__) || defined(__arm__) || \ - defined(__sparc__) || defined(__mips__) || defined(__sh__) + defined(__sparc__) || defined(__mips__) || defined(__sh__)) # define CURL_SIZEOF_LONG 4 # define CURL_TYPEOF_CURL_OFF_T long long # define CURL_FORMAT_CURL_OFF_T "lld" -- 2.50.0