diff options
Diffstat (limited to 'backends/platform/symbian')
| -rw-r--r-- | backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg | 2 | ||||
| -rw-r--r-- | backends/platform/symbian/src/portdefs.h | 21 |
2 files changed, 21 insertions, 2 deletions
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg index 30d2aa3db6..7dc58f4a61 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg @@ -33,7 +33,7 @@ :"ScummVM" ; UID is the app's UID -#{"ScummVM S60v3"},(0xA0000657),1,80,0 +#{"ScummVM S60v3"},(0xA0000657),2,00,0 ;Supports Series 60 v 3.0 [0x101F7961], 0, 0, 0, {"Series60ProductID"} diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index f9e0d04064..7729145eac 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -30,9 +30,17 @@ #include <stdlib.h> #include <stdio.h> #include <unistd.h> -#include <e32def.h> +#if (__GNUC__ && __cplusplus) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wreturn-local-addr" +#endif +#include <e32def.h> #include <e32std.h> +#if (__GNUC__ && __cplusplus) +#pragma GCC diagnostic pop +#endif + #include <libc\math.h> /* define pi */ @@ -53,6 +61,17 @@ typedef unsigned short int uint16; typedef signed short int int16; typedef unsigned long int uint32; typedef signed long int int32; +typedef signed long long int64; +typedef unsigned long long uint64; + +#ifdef __cplusplus +namespace std + { + + using ::size_t; + + } // namespace std +#endif // Define SCUMMVM_DONT_DEFINE_TYPES to prevent scummsys.h from trying to // re-define those data types. |