From 21cec8834fe822918c38db4cbb6e8650b5009914 Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Mon, 14 Jul 2014 10:42:53 -0600 Subject: [PATCH] fix LLD macro for gcc >= 4.8 on windows --- src/avian/common.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/avian/common.h b/src/avian/common.h index d3d5c98adb..82cdc046ce 100644 --- a/src/avian/common.h +++ b/src/avian/common.h @@ -151,10 +151,14 @@ typedef intptr_t __attribute__((__may_alias__)) intptr_alias_t; #if (defined ARCH_x86_32) || (defined ARCH_arm) #define LD "ld" #if (defined _MSC_VER) || ((defined __MINGW32__) && __GNUC__ >= 4) +#if (__GNUC__ == 4 && __GNUC_MINOR__ < 8) #define LLD "I64d" #else #define LLD "lld" #endif +#else +#define LLD "lld" +#endif #ifdef __APPLE__ #define ULD "lu" #define LX "lx" @@ -166,9 +170,14 @@ typedef intptr_t __attribute__((__may_alias__)) intptr_alias_t; #define LD "ld" #define LX "lx" #if (defined _MSC_VER) || (defined __MINGW32__) +#if (__GNUC__ == 4 && __GNUC_MINOR__ < 8) #define LLD "I64d" #define ULD "I64x" #else +#define LLD "lld" +#define ULD "llu" +#endif +#else #ifdef __APPLE__ #define LLD "lld" #else