--- np2/macos9/compiler.h 2004/03/26 05:51:40 1.10 +++ np2/macos9/compiler.h 2005/02/14 06:25:31 1.13 @@ -16,26 +16,25 @@ #define OSLINEBREAK_CR -typedef signed int SINT; -typedef unsigned int UINT; +typedef signed int SINT; +typedef unsigned int UINT; -typedef signed char SINT8; -typedef unsigned char UINT8; +typedef signed char SINT8; +typedef unsigned char UINT8; -typedef signed short SINT16; -typedef unsigned short UINT16; +typedef signed short SINT16; +typedef unsigned short UINT16; -typedef signed int SINT32; -typedef unsigned int UINT32; +typedef signed int SINT32; +typedef unsigned int UINT32; -typedef SInt64 SINT64; -typedef UInt64 UINT64; - -typedef Boolean BOOL; -typedef signed char TCHAR; -typedef signed char CHAR; -typedef unsigned char BYTE; +typedef SInt64 SINT64; +typedef UInt64 UINT64; +typedef Boolean BOOL; +typedef signed char TCHAR; +typedef signed char CHAR; +typedef unsigned char BYTE; #define MAX_PATH 260 @@ -46,6 +45,12 @@ typedef unsigned char BYTE; #define max(a, b) (((a)>(b))?(a):(b)) #define min(a, b) (((a)<(b))?(a):(b)) +#define BRESULT UINT8 +#define OEMCHAR char +#define OEMTEXT(string) (string) +#define OEMSPRINTF sprintf +#define OEMSTRLEN strlen + #include "common.h" #include "macossub.h" @@ -55,9 +60,11 @@ typedef unsigned char BYTE; #include "lstarray.h" #include "trace.h" + #define GETTICK() macos_gettick() -#define SPRINTF sprintf #define __ASSERT(s) +#define SPRINTF sprintf +#define STRLEN strlen #define VERMOUTH_LIB // #define SOUND_CRITICAL @@ -76,7 +83,7 @@ typedef unsigned char BYTE; #if defined(CPUCORE_IA32) #define SUPPORT_CRT31KHZ #define SUPPORT_PC9821 -#define IA32_PAGING_EACHSIZE +#define IA32_PAGING_EACHSIZE #endif #define SUPPORT_CRT15KHZ #define SUPPORT_HOSTDRV @@ -84,6 +91,9 @@ typedef unsigned char BYTE; #define SUPPORT_SASI #define SUPPORT_SCSI +#define SUPPORT_RESUME +#define SUPPORT_STATSAVE + #define SOUNDRESERVE 80