diff options
| author | Max Horn | 2011-05-05 17:07:34 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-09 16:23:21 +0200 |
| commit | db82d282ead67bab5b7889566bbb989c70bf3d12 (patch) | |
| tree | e0a1ec6b0a04dfa717d5351a730fe50c2d4e3c43 | |
| parent | 559fda409dc3fad9d4058e6d7bde8802211fa781 (diff) | |
| download | scummvm-rg350-db82d282ead67bab5b7889566bbb989c70bf3d12.tar.gz scummvm-rg350-db82d282ead67bab5b7889566bbb989c70bf3d12.tar.bz2 scummvm-rg350-db82d282ead67bab5b7889566bbb989c70bf3d12.zip | |
N64: Remove (u)int64 typedefs from common/scummsys.h
| -rw-r--r-- | backends/platform/n64/osys_n64_base.cpp | 2 | ||||
| -rw-r--r-- | common/scummsys.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp index 32b2b98227..6ec9b668d4 100644 --- a/backends/platform/n64/osys_n64_base.cpp +++ b/backends/platform/n64/osys_n64_base.cpp @@ -32,6 +32,8 @@ #include "framfs_save_manager.h" #include "backends/fs/n64/n64-fs-factory.h" +typedef unsigned long long uint64; + extern uint8 _romfs; // Defined by linker (used to calculate position of romfs image) inline uint16 colRGB888toBGR555(byte r, byte g, byte b); diff --git a/common/scummsys.h b/common/scummsys.h index 46f900b942..909f2b0701 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -309,9 +309,6 @@ typedef unsigned int uint32; typedef signed int int32; - typedef unsigned long long uint64; - typedef signed long long int64; - #elif defined(__PSP__) #include <malloc.h> |