about summary refs log tree commit diff
path: root/src/rt/miniz.cpp
diff options
context:
space:
mode:
authorJed Davis <jld@panix.com>2012-08-29 01:18:00 -0700
committerJed Davis <jld@panix.com>2012-08-29 01:18:00 -0700
commitb043349833f079e98e3d3a5e0917cd218c2f2021 (patch)
tree4f2db482d1b9e8073bddf3e64ad7b2da273d5977 /src/rt/miniz.cpp
parente398a72c42856de4a047a463e721a18223d67e52 (diff)
downloadrust-b043349833f079e98e3d3a5e0917cd218c2f2021.tar.gz
rust-b043349833f079e98e3d3a5e0917cd218c2f2021.zip
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".
Diffstat (limited to 'src/rt/miniz.cpp')
-rw-r--r--src/rt/miniz.cpp2
1 files changed, 1 insertions, 1 deletions
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