diff options
| author | johndoe123 | 2014-01-30 20:18:55 +0100 |
|---|---|---|
| committer | johndoe123 | 2014-01-30 20:18:55 +0100 |
| commit | cf51529cfd0fedb33b1b0c70beb59997b21cfc5b (patch) | |
| tree | 1df30e23c7f1eac7ca4a8ddfba40c89c2577dda7 /common/scummsys.h | |
| parent | 542197a891eac799855571fe2849e0dca43bdd2b (diff) | |
| parent | 462f7c1c24a48b7555316a3afae357bad14cc14b (diff) | |
| download | scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.tar.gz scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.tar.bz2 scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.zip | |
Merge remote-tracking branch 'origin/master' into bbvs
Diffstat (limited to 'common/scummsys.h')
| -rw-r--r-- | common/scummsys.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 3e9d5ef063..48dffc53a6 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -23,6 +23,10 @@ #ifndef COMMON_SCUMMSYS_H #define COMMON_SCUMMSYS_H +#ifndef __has_feature // Optional of course. + #define __has_feature(x) 0 // Compatibility with non-clang compilers. +#endif + // 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)))) @@ -401,6 +405,8 @@ typedef unsigned int uint32; typedef signed int int32; typedef unsigned int uint; + typedef signed long long int64; + typedef unsigned long long uint64; #endif |