Merge several fixes from PCSX Redux and adjust delay for SetLocPending. (#221)

[pcsx_rearmed.git] / libpcsxcore / plugins.h

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index e6ac694..e3bffc7 100644 (file)
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -33,24 +33,19 @@ extern "C" {
 typedef void* HWND;\r
 #define CALLBACK\r
 \r
-typedef long (*GPUopen)(unsigned long *, char *, char *);\r
-typedef long (*SPUopen)(void);\r
-typedef long (*PADopen)(unsigned long *);\r
-typedef long (*NETopen)(unsigned long *);\r
-typedef long (*SIO1open)(unsigned long *);\r
-\r
 #else\r
 \r
+#define WIN32_LEAN_AND_MEAN\r
 #include <windows.h>\r
 \r
-typedef long (CALLBACK* GPUopen)(HWND);\r
-typedef long (CALLBACK* SPUopen)(HWND);\r
-typedef long (CALLBACK* PADopen)(HWND);\r
-typedef long (CALLBACK* NETopen)(HWND);\r
-typedef long (CALLBACK* SIO1open)(HWND);\r
-\r
 #endif\r
 \r
+typedef long (CALLBACK *GPUopen)(unsigned long *, char *, char *);\r
+typedef long (CALLBACK *SPUopen)(void);\r
+typedef long (CALLBACK *PADopen)(unsigned long *);\r
+typedef long (CALLBACK *NETopen)(unsigned long *);\r
+typedef long (CALLBACK *SIO1open)(unsigned long *);\r
+\r
 #include "spu.h"\r
 \r
 #include "psemu_plugin_defs.h"\r
@@ -128,7 +123,7 @@ typedef long (CALLBACK* CDRopen)(void);
 typedef long (CALLBACK* CDRclose)(void);\r
 typedef long (CALLBACK* CDRgetTN)(unsigned char *);\r
 typedef long (CALLBACK* CDRgetTD)(unsigned char, unsigned char *);\r
-typedef long (CALLBACK* CDRreadTrack)(unsigned char *);\r
+typedef boolean (CALLBACK* CDRreadTrack)(unsigned char *);\r
 typedef unsigned char* (CALLBACK* CDRgetBuffer)(void);\r
 typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);\r
 typedef long (CALLBACK* CDRconfigure)(void);\r