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

onepad: move enum first in .h file 

It would avoid future compilation issue
This commit is contained in:
Gregory Hainaut 2017-04-16 14:49:37 +02:00
parent 94e19ac903
commit 35b162adbf
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/onepad/onepad.h
View File

@ -50,19 +50,6 @@ using namespace std;
#define PADdefs #define PADdefs
#include "PS2Edefs.h" #include "PS2Edefs.h"
#if defined(__unix__)
#include "GamePad.h"
#endif
#include "bitwise.h"
#include "controller.h"
#include "KeyStatus.h"
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((stdcall, externally_visible, visibility("default"))) type
#endif
enum PadOptions { enum PadOptions {
PADOPTION_FORCEFEEDBACK = 0x1, PADOPTION_FORCEFEEDBACK = 0x1,
PADOPTION_REVERSELX = 0x2, PADOPTION_REVERSELX = 0x2,
@ -73,13 +60,6 @@ enum PadOptions {
PADOPTION_MOUSE_R = 0x40, PADOPTION_MOUSE_R = 0x40,
}; };
extern FILE *padLog;
extern void initLogging();
extern bool toggleAutoRepeat;
#define PAD_LOG __Log
//#define PAD_LOG __LogToConsole
enum PadCommands { enum PadCommands {
CMD_SET_VREF_PARAM = 0x40, CMD_SET_VREF_PARAM = 0x40,
CMD_QUERY_DS2_ANALOG_MODE = 0x41, CMD_QUERY_DS2_ANALOG_MODE = 0x41,
@ -121,6 +101,26 @@ enum gamePadValues {
PAD_R_LEFT // Right joystick (Left) ← PAD_R_LEFT // Right joystick (Left) ←
}; };
#if defined(__unix__)
#include "GamePad.h"
#endif
#include "bitwise.h"
#include "controller.h"
#include "KeyStatus.h"
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((stdcall, externally_visible, visibility("default"))) type
#endif
extern FILE *padLog;
extern void initLogging();
extern bool toggleAutoRepeat;
#define PAD_LOG __Log
//#define PAD_LOG __LogToConsole
extern keyEvent event; extern keyEvent event;
extern queue<keyEvent> ev_fifo; extern queue<keyEvent> ev_fifo;
extern pthread_spinlock_t mutex_KeyEvent; extern pthread_spinlock_t mutex_KeyEvent;