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

spu2-x: Use _WIN32 for Windows preprocessor macro

This commit is contained in:
Jonathan Li 2016-01-27 22:49:14 +00:00
parent 04a8efd8c3
commit d5e56c7e76
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/spu2-x/src/SndOut_Portaudio.cpp
View File

@ -26,7 +26,7 @@
#include <vector> #include <vector>
#ifdef __WIN32__ #ifdef _WIN32
#include "pa_win_wasapi.h" #include "pa_win_wasapi.h"
#endif #endif
@ -246,7 +246,7 @@ public:
break; break;
} }
#ifdef __WIN32__ #ifdef _WIN32
PaWasapiStreamInfo info = { PaWasapiStreamInfo info = {
sizeof(PaWasapiStreamInfo), sizeof(PaWasapiStreamInfo),
paWASAPI, paWASAPI,
@ -344,7 +344,7 @@ public:
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
#ifdef WIN32 #ifdef _WIN32
private: private:
bool _ConfigProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) bool _ConfigProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
@ -666,7 +666,7 @@ int PaCallback( const void *inputBuffer, void *outputBuffer,
return PA.ActualPaCallback->ReadSamples(inputBuffer,outputBuffer,framesPerBuffer,timeInfo,statusFlags,userData); return PA.ActualPaCallback->ReadSamples(inputBuffer,outputBuffer,framesPerBuffer,timeInfo,statusFlags,userData);
} }
#ifdef WIN32 #ifdef _WIN32
BOOL CALLBACK Portaudio::ConfigProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) BOOL CALLBACK Portaudio::ConfigProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
{ {
return PA._ConfigProc( hWnd, uMsg, wParam, lParam ); return PA._ConfigProc( hWnd, uMsg, wParam, lParam );

12
plugins/spu2-x/src/Spu2replay.cpp
View File

@ -109,7 +109,7 @@ bool Running = false;
int conprintf(const char* fmt, ...) int conprintf(const char* fmt, ...)
{ {
#ifdef WIN32 #ifdef _WIN32
char s[1024]; char s[1024];
va_list list; va_list list;
@ -156,7 +156,7 @@ void dummy7()
u64 HighResFrequency() u64 HighResFrequency()
{ {
u64 freq; u64 freq;
#ifdef WIN32 #ifdef _WIN32
QueryPerformanceFrequency((LARGE_INTEGER*)&freq); QueryPerformanceFrequency((LARGE_INTEGER*)&freq);
#else #else
// TODO // TODO
@ -167,7 +167,7 @@ u64 HighResFrequency()
u64 HighResCounter() u64 HighResCounter()
{ {
u64 time; u64 time;
#ifdef WIN32 #ifdef _WIN32
QueryPerformanceCounter((LARGE_INTEGER*)&time); QueryPerformanceCounter((LARGE_INTEGER*)&time);
#else #else
// TODO // TODO
@ -203,7 +203,7 @@ u32 WaitSync( u32 TargetCycle )
return delta; return delta;
} }
#ifdef WIN32 #ifdef _WIN32
BOOL WINAPI HandlerRoutine(DWORD dwCtrlType) BOOL WINAPI HandlerRoutine(DWORD dwCtrlType)
{ {
Running = false; Running = false;
@ -219,7 +219,7 @@ EXPORT_C_(void) s2r_replay(HWND hwnd, HINSTANCE hinst, LPSTR filename, int nCmdS
Running = true; Running = true;
#ifdef WIN32 #ifdef _WIN32
AllocConsole(); AllocConsole();
SetConsoleCtrlHandler(HandlerRoutine, TRUE); SetConsoleCtrlHandler(HandlerRoutine, TRUE);
@ -309,7 +309,7 @@ Finish:
conprintf("Finished playing %s file (%d cycles, %d events).",filename,CurrentIOPCycle,events); conprintf("Finished playing %s file (%d cycles, %d events).",filename,CurrentIOPCycle,events);
#ifdef WIN32 #ifdef _WIN32
FreeConsole(); FreeConsole();
#endif #endif

2
plugins/spu2-x/src/spu2sys.cpp
View File

@ -376,7 +376,7 @@ __forceinline void TimeUpdate(u32 cClocks)
} }
// Visual debug display showing all core's activity! Disabled via #define on release builds. // Visual debug display showing all core's activity! Disabled via #define on release builds.
#ifdef __WIN32__ #ifdef _WIN32
UpdateDebugDialog(); UpdateDebugDialog();
#endif #endif