--- np2/win9x/compiler.h 2005/02/09 20:11:35 1.23 +++ np2/win9x/compiler.h 2005/03/02 04:28:08 1.25 @@ -19,15 +19,15 @@ #define OSLINEBREAK_CRLF #ifndef __GNUC__ -typedef signed int SINT; -typedef signed char SINT8; -typedef unsigned char UINT8; +typedef signed int SINT; +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; +typedef signed __int64 SINT64; +typedef unsigned __int64 UINT64; #define INLINE __inline #define QWORD_CONST(v) ((UINT64)(v)) #define SQWORD_CONST(v) ((SINT64)(v)) @@ -35,22 +35,22 @@ typedef unsigned __int64 UINT64; #define vsnprintf _vsnprintf #else #include -typedef signed char SINT8; -typedef unsigned char UINT8; -typedef short SINT16; +typedef signed char SINT8; +typedef unsigned char UINT8; +typedef signed short SINT16; typedef unsigned short UINT16; -typedef int SINT32; -typedef signed __int64 SINT64; +typedef signed int SINT32; +typedef signed __int64 SINT64; #define INLINE inline #endif #define FASTCALL __fastcall +// for x86 #define LOADINTELDWORD(a) (*((UINT32 *)(a))) #define LOADINTELWORD(a) (*((UINT16 *)(a))) #define STOREINTELDWORD(a, b) *(UINT32 *)(a) = (b) #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) @@ -64,12 +64,13 @@ typedef signed __int64 SINT64; #define OEMSPRINTF wsprintf #define OEMSTRLEN lstrlen + #include "common.h" #include "milstr.h" #include "_memory.h" -#include "trace.h" #include "rect.h" #include "lstarray.h" +#include "trace.h" #define GETTICK() GetTickCount() @@ -87,17 +88,18 @@ typedef signed __int64 SINT64; #endif #define LABEL __declspec(naked) -#define RELEASE(x) if (x) {(x)->Release(); (x) = NULL;} +#define RELEASE(x) if (x) {(x)->Release(); (x) = NULL;} #define OPNGENX86 #define VERMOUTH_LIB +#define MT32SOUND_DLL #define PARTSCALL __fastcall #define CPUCALL __fastcall #define MEMCALL __fastcall -#define DMACCALL __fastcall +#define DMACCALL __fastcall #define IOOUTCALL __fastcall #define IOINPCALL __fastcall -#define SOUNDCALL __fastcall +#define SOUNDCALL __fastcall #define VRAMCALL __fastcall #define SCRNCALL __fastcall @@ -111,11 +113,11 @@ typedef signed __int64 SINT64; #define SUPPORT_16BPP #define SUPPORT_24BPP #define SUPPORT_32BPP -#define SUPPORT_NORMALDISP +#define SUPPORT_NORMALDISP #if defined(SUPPORT_PC9821) #define CPUCORE_IA32 -#define IA32_PAGING_EACHSIZE +#define IA32_PAGING_EACHSIZE #define SUPPORT_CRT31KHZ #define SUPPORT_PC9801_119 #endif