--- np2/win9x/compiler.h 2003/11/03 00:49:55 1.6 +++ np2/win9x/compiler.h 2004/04/20 17:27:18 1.19 @@ -4,25 +4,38 @@ #include #include #include +#include #define BYTESEX_LITTLE +#define OSLANG_SJIS +#define OSLINEBREAK_CRLF -#ifndef __GNUC__ - -typedef short SINT16; -typedef unsigned short UINT16; -typedef int SINT32; -typedef unsigned int UINT32; +#ifndef __GNUC__ +typedef signed char SINT8; +typedef unsigned char UINT8; +typedef signed short SINT16; +typedef unsigned short UINT16; +typedef signed int SINT32; +typedef unsigned int UINT32; +typedef signed __int64 SINT64; +typedef unsigned __int64 UINT64; +#define INLINE __inline +#define QWORD_CONST(v) ((UINT64)(v)) +#define SQWORD_CONST(v) ((SINT64)(v)) +#define snprintf _snprintf +#define vsnprintf _vsnprintf #else - #include -typedef short SINT16; -typedef unsigned short UINT16; -typedef int SINT32; - +typedef signed char SINT8; +typedef unsigned char UINT8; +typedef short SINT16; +typedef unsigned short UINT16; +typedef int SINT32; +typedef signed __int64 SINT64; +#define INLINE inline #endif - +#define FASTCALL __fastcall #define LOADINTELDWORD(a) (*((UINT32 *)(a))) #define LOADINTELWORD(a) (*((UINT16 *)(a))) @@ -30,6 +43,12 @@ typedef int SINT32; #define STOREINTELWORD(a, b) *(UINT16 *)(a) = (b) +#define sigjmp_buf jmp_buf +#define sigsetjmp(env, mask) setjmp(env) +#define siglongjmp(env, val) longjmp(env, val) +#define msgbox(title, msg) MessageBox(NULL, msg, title, MB_OK) + + #include "common.h" #include "milstr.h" #include "_memory.h" @@ -37,12 +56,13 @@ typedef int SINT32; #include "lstarray.h" #include "trace.h" + #define GETTICK() GetTickCount() -#define GETRAND() rand() #define SPRINTF wsprintf +#define __ASSERT(s) -#define LABEL __declspec(naked) -#define RELEASE(x) if (x) {(x)->Release(); (x) = NULL;} +#define LABEL __declspec(naked) +#define RELEASE(x) if (x) {(x)->Release(); (x) = NULL;} #define OPNGENX86 #define VERMOUTH_LIB @@ -56,11 +76,33 @@ typedef int SINT32; #define VRAMCALL __fastcall #define SCRNCALL __fastcall +#define SUPPORT_SJIS + #define SUPPORT_8BPP #define SUPPORT_16BPP #define SUPPORT_24BPP #define SUPPORT_32BPP #define SUPPORT_NORMALDISP +#if defined(SUPPORT_PC9821) +#define CPUCORE_IA32 +#define IA32_PAGING_EACHSIZE +#define SUPPORT_CRT31KHZ +#define SUPPORT_PC9801_119 +#endif +#define SUPPORT_CRT15KHZ +#define SUPPORT_PC9861K +// #define SUPPORT_SOFTKBD 0 +#define SUPPORT_S98 +#define SUPPORT_KEYDISP +#define SUPPORT_MEMDBG32 +#define SUPPORT_HOSTDRV +#define SUPPORT_SASI +#define SUPPORT_SCSI + +#define SUPPORT_RESUME +#define SUPPORT_STATSAVE 10 +#define SUPPORT_ROMEO + #define SOUNDRESERVE 20