diff options
| author | Bastien Bouclet | 2017-09-24 19:06:17 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2017-09-30 21:35:16 +0200 |
| commit | 55f46d36671b1ceb23b06a7ce00627379352f9ca (patch) | |
| tree | 9df4205bf5a59258f437d1658c14b19c3726ab82 /common | |
| parent | 9db2953ca38b391470019ed427070ed425cc5084 (diff) | |
| download | scummvm-rg350-55f46d36671b1ceb23b06a7ce00627379352f9ca.tar.gz scummvm-rg350-55f46d36671b1ceb23b06a7ce00627379352f9ca.tar.bz2 scummvm-rg350-55f46d36671b1ceb23b06a7ce00627379352f9ca.zip | |
BUILD: Define pointer sized integer types and remove SCUMM_64BITS
Diffstat (limited to 'common')
| -rw-r--r-- | common/scummsys.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 432dd74fa7..42fcdf79dd 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -310,26 +310,6 @@ #endif // -// Determine 64 bitness -// Reference: http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros -// -#if !defined(HAVE_CONFIG_H) - - #if defined(__x86_64__) || \ - defined(_M_X64) || \ - defined(__ppc64__) || \ - defined(__powerpc64__) || \ - defined(__LP64__) - - #if !defined(SCUMM_64BITS) - #define SCUMM_64BITS - #endif - - #endif - -#endif - -// // Some more system specific settings. // TODO/FIXME: All of these should be moved to backend specific files (such as portdefs.h) // @@ -452,6 +432,27 @@ #endif #endif +// +// Determine 64 bitness +// Reference: http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros +// +#if !defined(HAVE_CONFIG_H) + +#if defined(__x86_64__) || \ + defined(_M_X64) || \ + defined(__ppc64__) || \ + defined(__powerpc64__) || \ + defined(__LP64__) + +typedef uint64 uintptr; + +#else + +typedef uint32 uintptr; + +#endif + +#endif // // Overlay color type (FIXME: shouldn't be declared here) |