From 267ccc45a3e875bf87832a8ad615be690b4926d3 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 25 Feb 2013 01:04:16 +0600 Subject: [PATCH] Fix for MinGW build on Windows GG_LONGLONG and GG_ULONGLONG shall use LL and ULL suffixes, since MinGW is actuall a GCC compiler. Solved by checking whether compilation happens with MinGW or not using standard MinGW's __MINGW32__ and __MINGW64__ definitions. Change-Id: I789b34f6342a56ba42f4b280f7242700022ab7a1 --- internal/ceres/collections_port.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/ceres/collections_port.h b/internal/ceres/collections_port.h index 063b6d3d9..715c975e0 100644 --- a/internal/ceres/collections_port.h +++ b/internal/ceres/collections_port.h @@ -77,7 +77,7 @@ struct HashMap : std::tr1::unordered_map {}; template struct HashSet : std::tr1::unordered_set {}; -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__) #define GG_LONGLONG(x) x##I64 #define GG_ULONGLONG(x) x##UI64 #else