diff --git a/plugins/USBqemu/USB.h b/plugins/USBqemu/USB.h index b190d94996..3404a8196c 100644 --- a/plugins/USBqemu/USB.h +++ b/plugins/USBqemu/USB.h @@ -26,7 +26,7 @@ #define USBdefs #include "PS2Edefs.h" -#ifdef __WIN32__ +#ifdef _WIN32 # include # include #else diff --git a/plugins/dev9ghzdrk/DEV9.cpp b/plugins/dev9ghzdrk/DEV9.cpp index 9ae3356dab..e4b83c0b18 100644 --- a/plugins/dev9ghzdrk/DEV9.cpp +++ b/plugins/dev9ghzdrk/DEV9.cpp @@ -32,7 +32,7 @@ #include "smap.h" #include "ata.h" -#ifdef __WIN32__ +#ifdef _WIN32 #pragma warning(disable:4244) HINSTANCE hInst=NULL; diff --git a/plugins/dev9ghzdrk/DEV9.h b/plugins/dev9ghzdrk/DEV9.h index d9ca01192b..72a3eafc35 100644 --- a/plugins/dev9ghzdrk/DEV9.h +++ b/plugins/dev9ghzdrk/DEV9.h @@ -29,7 +29,7 @@ #include "PS2Eext.h" #include "net.h" -#ifdef __WIN32__ +#ifdef _WIN32 #define usleep(x) Sleep(x / 1000) #include diff --git a/plugins/dev9ghzdrk/PS2Edefs.h b/plugins/dev9ghzdrk/PS2Edefs.h index 20b2d64136..88abb0284b 100644 --- a/plugins/dev9ghzdrk/PS2Edefs.h +++ b/plugins/dev9ghzdrk/PS2Edefs.h @@ -30,7 +30,7 @@ * OSflags: __linux__ (linux OS) - __WIN32__ (win32 OS) + _WIN32 (win32 OS) * common return values (for ie. GSinit): 0 - success @@ -170,7 +170,7 @@ typedef struct { void *common; } GSdriverInfo; -#ifdef __WIN32__ +#ifdef _WIN32 typedef struct { // unsupported values must be set to zero HWND hWnd; HMENU hMenu; @@ -208,7 +208,7 @@ void CALLBACK GSmakeSnapshot(char *path); void CALLBACK GSirqCallback(void (*callback)()); void CALLBACK GSprintf(int timeout, char *fmt, ...); void CALLBACK GSgetDriverInfo(GSdriverInfo *info); -#ifdef __WIN32__ +#ifdef _WIN32 s32 CALLBACK GSsetWindowInfo(winInfo *info); #endif s32 CALLBACK GSfreeze(int mode, freezeData *data); @@ -425,7 +425,7 @@ typedef void (CALLBACK* _GSkeyEvent)(keyEvent* ev); typedef void (CALLBACK* _GSirqCallback)(void (*callback)()); typedef void (CALLBACK* _GSprintf)(int timeout, char *fmt, ...); typedef void (CALLBACK* _GSgetDriverInfo)(GSdriverInfo *info); -#ifdef __WIN32__ +#ifdef _WIN32 typedef s32 (CALLBACK* _GSsetWindowInfo)(winInfo *info); #endif typedef void (CALLBACK* _GSmakeSnapshot)(char *path); @@ -565,7 +565,7 @@ _GSmakeSnapshot GSmakeSnapshot; _GSirqCallback GSirqCallback; _GSprintf GSprintf; _GSgetDriverInfo GSgetDriverInfo; -#ifdef __WIN32__ +#ifdef _WIN32 _GSsetWindowInfo GSsetWindowInfo; #endif _GSfreeze GSfreeze; diff --git a/plugins/dev9ghzdrk/PS2Etypes.h b/plugins/dev9ghzdrk/PS2Etypes.h index ffc801e2c1..dd3c10ff54 100644 --- a/plugins/dev9ghzdrk/PS2Etypes.h +++ b/plugins/dev9ghzdrk/PS2Etypes.h @@ -17,7 +17,7 @@ #define __PS2ETYPES_H__ // Basic types -#if defined(__WIN32__) +#if defined(_WIN32) typedef __int8 s8; typedef __int16 s16;