diff options
| author | Norbert Lange | 2009-09-11 12:58:08 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-09-11 12:58:08 +0000 |
| commit | 75aafd9c337684d707b27456cd98a2e8ecc3507d (patch) | |
| tree | 6c9ea34ee41dbc5d563ae7efaa738208743477b5 /common | |
| parent | 4fc8fe80239ba18a6406fc2349b0932c6ea6d87c (diff) | |
| download | scummvm-rg350-75aafd9c337684d707b27456cd98a2e8ecc3507d.tar.gz scummvm-rg350-75aafd9c337684d707b27456cd98a2e8ecc3507d.tar.bz2 scummvm-rg350-75aafd9c337684d707b27456cd98a2e8ecc3507d.zip | |
fix duplicate definition of FORCEINLINE on mingw toolchains
svn-id: r44033
Diffstat (limited to 'common')
| -rw-r--r-- | common/scummsys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index bdb11344bc..2191211afe 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -383,7 +383,7 @@ #define PACKED_STRUCT __attribute__((__packed__)) #define GCC_PRINTF(x,y) __attribute__((__format__(printf, x, y))) - #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) + #if !defined(FORCEINLINE) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) #define FORCEINLINE __attribute__((__always_inline__)) inline #endif #else |