diff options
| author | Twinaphex | 2015-01-25 22:49:32 +0100 |
|---|---|---|
| committer | Twinaphex | 2015-01-25 22:49:32 +0100 |
| commit | cebb70f24ab54693b12aaa27b85a52689e26e1ff (patch) | |
| tree | 854c202544c75e486d4243b34366162f03f082eb /plugins/dfinput | |
| parent | be1294d017cba3f18cf66597f0cbed207fed26bf (diff) | |
| parent | 4e9adec1930817da2031fd044dc74c0f454a0079 (diff) | |
| download | pcsx_rearmed-cebb70f24ab54693b12aaa27b85a52689e26e1ff.tar.gz pcsx_rearmed-cebb70f24ab54693b12aaa27b85a52689e26e1ff.tar.bz2 pcsx_rearmed-cebb70f24ab54693b12aaa27b85a52689e26e1ff.zip | |
Merge pull request #12 from notaz/for_libretro
r21 merge
Diffstat (limited to 'plugins/dfinput')
| -rw-r--r-- | plugins/dfinput/main.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c index 73b2bda..475ea07 100644 --- a/plugins/dfinput/main.c +++ b/plugins/dfinput/main.c @@ -8,6 +8,13 @@ * See the COPYING file in the top-level directory. */ +#ifndef _WIN32 +#define CALLBACK +#else +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#endif + #include "main.h" unsigned char CurPad, CurByte, CurCmd, CmdLen; @@ -15,10 +22,10 @@ unsigned char CurPad, CurByte, CurCmd, CmdLen; /* since this is not a proper plugin, so we'll hook emu internals in a hackish way like this */ extern void *PAD1_startPoll, *PAD1_poll; extern void *PAD2_startPoll, *PAD2_poll; -extern unsigned char PAD1__startPoll(int pad); -extern unsigned char PAD2__startPoll(int pad); -extern unsigned char PAD1__poll(unsigned char value); -extern unsigned char PAD2__poll(unsigned char value); +extern unsigned char CALLBACK PAD1__startPoll(int pad); +extern unsigned char CALLBACK PAD2__startPoll(int pad); +extern unsigned char CALLBACK PAD1__poll(unsigned char value); +extern unsigned char CALLBACK PAD2__poll(unsigned char value); static int old_controller_type1 = -1, old_controller_type2 = -1; |