diff options
| author | Graydon Hoare <graydon@pobox.com> | 2012-08-29 10:31:17 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@pobox.com> | 2012-08-29 10:31:17 -0700 |
| commit | cdcf5a7580147a58ecbe06323ad7c267f2e5ae28 (patch) | |
| tree | bf30a991d8e22360babf6dea25a60680786bd0bc /src | |
| parent | 75201cdc044205ba27178aaa311d9b7b743c57d0 (diff) | |
| parent | b043349833f079e98e3d3a5e0917cd218c2f2021 (diff) | |
| download | rust-cdcf5a7580147a58ecbe06323ad7c267f2e5ae28.tar.gz rust-cdcf5a7580147a58ecbe06323ad7c267f2e5ae28.zip | |
Merge pull request #3299 from jld/mz-forceinline
Fix MZ_FORCEINLINE define to work with GCC 4.7.1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/miniz.cpp | 2 |
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 |