diff options
| author | Enrico Rolfi | 2002-05-05 19:06:51 +0000 |
|---|---|---|
| committer | Enrico Rolfi | 2002-05-05 19:06:51 +0000 |
| commit | 38d048b86bd96796511a44b62b020ac6f6dfea3b (patch) | |
| tree | ee3fd5d3eafd3d240eacbdea0af8a33c5fe83f48 /scummsys.h | |
| parent | 00f35bec5a387a2bd4dc983372245edb8e4a7c8f (diff) | |
| download | scummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.tar.gz scummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.tar.bz2 scummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.zip | |
Fixed some things for Macintosh ports
svn-id: r4212
Diffstat (limited to 'scummsys.h')
| -rw-r--r-- | scummsys.h | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/scummsys.h b/scummsys.h index d82fb309c6..ce56fee14a 100644 --- a/scummsys.h +++ b/scummsys.h @@ -131,10 +131,12 @@ typedef signed long int32; #define NORETURN #endif -#elif defined(__APPLE__CW) +#elif defined(macintosh) #include <stdlib.h> #include <stdio.h> +#include "macos.h" + #define scumm_stricmp strcmp inline char* strdup(char *buf) {return (char*)buf;}; @@ -215,37 +217,6 @@ typedef signed long int32; #define START_PACK_STRUCTS pack (push,1) #define END_PACK_STRUCTS pack(pop) -#elif (defined(__MWERKS__) && defined(macintosh) && !defined(__APPLE__CW)) - - #define scumm_stricmp strcmp - - #define MACOS - #define NEED_STRDUP - - #define CHECK_HEAP - - #define SCUMM_BIG_ENDIAN - #define SCUMM_NEED_ALIGNMENT - - #define FORCEINLINE inline - - #define NORETURN - - #define CDECL - - typedef unsigned char byte; - typedef unsigned char uint8; - typedef unsigned short uint16; - typedef unsigned long uint32; - typedef unsigned int uint; - typedef signed char int8; - typedef signed short int16; - typedef signed long int32; - - #define START_PACK_STRUCTS options align=packed - #define END_PACK_STRUCTS options align=reset - #define GCC_PACK - #else #error No system type defined #endif |