diff options
| author | Willem Jan Palenstijn | 2016-08-13 11:57:39 +0200 |
|---|---|---|
| committer | GitHub | 2016-08-13 11:57:39 +0200 |
| commit | 68a15c10bec09edf37b4b357e3efbc055a402bdf (patch) | |
| tree | 69d208325eeaa33a890ee66d27607e7ecb778789 /common | |
| parent | 6a9923ec07d019cbbf8c35e36030391dac256e79 (diff) | |
| parent | 4d120800fa63433e2fc2d76d69178431d53ba29e (diff) | |
| download | scummvm-rg350-68a15c10bec09edf37b4b357e3efbc055a402bdf.tar.gz scummvm-rg350-68a15c10bec09edf37b4b357e3efbc055a402bdf.tar.bz2 scummvm-rg350-68a15c10bec09edf37b4b357e3efbc055a402bdf.zip | |
Merge pull request #790 from salty-horse/clang_fixes
ALL: Don't use 'defined' in macro definitions
Diffstat (limited to 'common')
| -rw-r--r-- | common/scummsys.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 5e1069fb46..959c67a404 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -29,7 +29,11 @@ // This is a convenience macro to test whether the compiler used is a GCC // version, which is at least major.minor. -#define GCC_ATLEAST(major, minor) (defined(__GNUC__) && (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))) +#ifdef __GNUC__ + #define GCC_ATLEAST(major, minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) +#else + #define GCC_ATLEAST(major, minor) 0 +#endif #if defined(_WIN32_WCE) && _WIN32_WCE < 300 #define NONSTANDARD_PORT |