diff options
| author | notaz | 2015-01-25 23:21:40 +0200 |
|---|---|---|
| committer | notaz | 2015-01-25 23:21:40 +0200 |
| commit | 4e9adec1930817da2031fd044dc74c0f454a0079 (patch) | |
| tree | 854c202544c75e486d4243b34366162f03f082eb /libpcsxcore/plugins.h | |
| parent | be1294d017cba3f18cf66597f0cbed207fed26bf (diff) | |
| parent | ba10822d813767632c528102055e3eeb54730b2c (diff) | |
| download | pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.gz pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.bz2 pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.zip | |
Merge branch 'upstream' into libretro
Diffstat (limited to 'libpcsxcore/plugins.h')
| -rw-r--r-- | libpcsxcore/plugins.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h index e6ac694..132df90 100644 --- a/libpcsxcore/plugins.h +++ b/libpcsxcore/plugins.h @@ -33,24 +33,19 @@ extern "C" { typedef void* HWND;
#define CALLBACK
-typedef long (*GPUopen)(unsigned long *, char *, char *);
-typedef long (*SPUopen)(void);
-typedef long (*PADopen)(unsigned long *);
-typedef long (*NETopen)(unsigned long *);
-typedef long (*SIO1open)(unsigned long *);
-
#else
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-typedef long (CALLBACK* GPUopen)(HWND);
-typedef long (CALLBACK* SPUopen)(HWND);
-typedef long (CALLBACK* PADopen)(HWND);
-typedef long (CALLBACK* NETopen)(HWND);
-typedef long (CALLBACK* SIO1open)(HWND);
-
#endif
+typedef long (CALLBACK *GPUopen)(unsigned long *, char *, char *);
+typedef long (CALLBACK *SPUopen)(void);
+typedef long (CALLBACK *PADopen)(unsigned long *);
+typedef long (CALLBACK *NETopen)(unsigned long *);
+typedef long (CALLBACK *SIO1open)(unsigned long *);
+
#include "spu.h"
#include "psemu_plugin_defs.h"
|