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