From b043349833f079e98e3d3a5e0917cd218c2f2021 Mon Sep 17 00:00:00 2001 From: Jed Davis Date: Wed, 29 Aug 2012 01:18:00 -0700 Subject: [PATCH] Fix MZ_FORCEINLINE define to work with GCC 4.7.1. Using just __always_inline__ without inline results in several instances of "error: always_inline function might not be inlinable". --- src/rt/miniz.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rt/miniz.cpp b/src/rt/miniz.cpp index 69df7790c38..2b803b06d09 100644 --- a/src/rt/miniz.cpp +++ b/src/rt/miniz.cpp @@ -391,7 +391,7 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1]; #ifdef _MSC_VER #define MZ_FORCEINLINE __forceinline #elif defined(__GNUC__) - #define MZ_FORCEINLINE __attribute__((__always_inline__)) + #define MZ_FORCEINLINE inline __attribute__((__always_inline__)) #else #define MZ_FORCEINLINE #endif