ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usbqemu|dev9ghzdrk: Use _WIN32 for Windows preprocessor macro

This commit is contained in:
Jonathan Li 2016-01-27 22:58:09 +00:00
parent d5e56c7e76
commit 3544b84632
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/USBqemu/USB.h
View File

@ -26,7 +26,7 @@
#define USBdefs #define USBdefs
#include "PS2Edefs.h" #include "PS2Edefs.h"
#ifdef __WIN32__ #ifdef _WIN32
# include <windows.h> # include <windows.h>
# include <windowsx.h> # include <windowsx.h>
#else #else

2
plugins/dev9ghzdrk/DEV9.cpp
View File

@ -32,7 +32,7 @@
#include "smap.h" #include "smap.h"
#include "ata.h" #include "ata.h"
#ifdef __WIN32__ #ifdef _WIN32
#pragma warning(disable:4244) #pragma warning(disable:4244)
HINSTANCE hInst=NULL; HINSTANCE hInst=NULL;

2
plugins/dev9ghzdrk/DEV9.h
View File

@ -29,7 +29,7 @@
#include "PS2Eext.h" #include "PS2Eext.h"
#include "net.h" #include "net.h"
#ifdef __WIN32__ #ifdef _WIN32
#define usleep(x) Sleep(x / 1000) #define usleep(x) Sleep(x / 1000)
#include <windows.h> #include <windows.h>

10
plugins/dev9ghzdrk/PS2Edefs.h
View File

@ -30,7 +30,7 @@
* OSflags: * OSflags:
__linux__ (linux OS) __linux__ (linux OS)
__WIN32__ (win32 OS) _WIN32 (win32 OS)
* common return values (for ie. GSinit): * common return values (for ie. GSinit):
0 - success 0 - success
@ -170,7 +170,7 @@ typedef struct {
void *common; void *common;
} GSdriverInfo; } GSdriverInfo;
#ifdef __WIN32__ #ifdef _WIN32
typedef struct { // unsupported values must be set to zero typedef struct { // unsupported values must be set to zero
HWND hWnd; HWND hWnd;
HMENU hMenu; HMENU hMenu;
@ -208,7 +208,7 @@ void CALLBACK GSmakeSnapshot(char *path);
void CALLBACK GSirqCallback(void (*callback)()); void CALLBACK GSirqCallback(void (*callback)());
void CALLBACK GSprintf(int timeout, char *fmt, ...); void CALLBACK GSprintf(int timeout, char *fmt, ...);
void CALLBACK GSgetDriverInfo(GSdriverInfo *info); void CALLBACK GSgetDriverInfo(GSdriverInfo *info);
#ifdef __WIN32__ #ifdef _WIN32
s32 CALLBACK GSsetWindowInfo(winInfo *info); s32 CALLBACK GSsetWindowInfo(winInfo *info);
#endif #endif
s32 CALLBACK GSfreeze(int mode, freezeData *data); 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* _GSirqCallback)(void (*callback)());
typedef void (CALLBACK* _GSprintf)(int timeout, char *fmt, ...); typedef void (CALLBACK* _GSprintf)(int timeout, char *fmt, ...);
typedef void (CALLBACK* _GSgetDriverInfo)(GSdriverInfo *info); typedef void (CALLBACK* _GSgetDriverInfo)(GSdriverInfo *info);
#ifdef __WIN32__ #ifdef _WIN32
typedef s32 (CALLBACK* _GSsetWindowInfo)(winInfo *info); typedef s32 (CALLBACK* _GSsetWindowInfo)(winInfo *info);
#endif #endif
typedef void (CALLBACK* _GSmakeSnapshot)(char *path); typedef void (CALLBACK* _GSmakeSnapshot)(char *path);
@ -565,7 +565,7 @@ _GSmakeSnapshot GSmakeSnapshot;
_GSirqCallback GSirqCallback; _GSirqCallback GSirqCallback;
_GSprintf GSprintf; _GSprintf GSprintf;
_GSgetDriverInfo GSgetDriverInfo; _GSgetDriverInfo GSgetDriverInfo;
#ifdef __WIN32__ #ifdef _WIN32
_GSsetWindowInfo GSsetWindowInfo; _GSsetWindowInfo GSsetWindowInfo;
#endif #endif
_GSfreeze GSfreeze; _GSfreeze GSfreeze;

2
plugins/dev9ghzdrk/PS2Etypes.h
View File

@ -17,7 +17,7 @@
#define __PS2ETYPES_H__ #define __PS2ETYPES_H__
// Basic types // Basic types
#if defined(__WIN32__) #if defined(_WIN32)
typedef __int8 s8; typedef __int8 s8;
typedef __int16 s16; typedef __int16 s16;