notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cdrom: some debugging aid
[pcsx_rearmed.git]
/
frontend
/
plugin.c
diff --git
a/frontend/plugin.c
b/frontend/plugin.c
index
a617c24
..
812e503
100644
(file)
--- a/
frontend/plugin.c
+++ b/
frontend/plugin.c
@@
-15,14
+15,11
@@
#include "../libpcsxcore/system.h"
#include "../plugins/cdrcimg/cdrcimg.h"
#include "../libpcsxcore/system.h"
#include "../plugins/cdrcimg/cdrcimg.h"
-#ifndef _WIN32
+// this can't be __stdcall like it was in PSEmu API as too many functions are mixed up
+#undef CALLBACK
#define CALLBACK
#define CALLBACK
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-static
int
dummy_func() {
+static
long CALLBACK
dummy_func() {
return 0;
}
return 0;
}
@@
-49,7
+46,7
@@
extern void CALLBACK SPUasync(unsigned int, unsigned int);
extern int CALLBACK SPUplayCDDAchannel(short *, int);
/* PAD */
extern int CALLBACK SPUplayCDDAchannel(short *, int);
/* PAD */
-static long PADreadPort1(PadDataS *pad) {
+static long
CALLBACK
PADreadPort1(PadDataS *pad) {
int pad_index = pad->requestPadIndex;
pad->controllerType = in_type[pad_index];
int pad_index = pad->requestPadIndex;
pad->controllerType = in_type[pad_index];
@@
-80,7
+77,7
@@
static long PADreadPort1(PadDataS *pad) {
return 0;
}
return 0;
}
-static long PADreadPort2(PadDataS *pad) {
+static long
CALLBACK
PADreadPort2(PadDataS *pad) {
int pad_index = pad->requestPadIndex;
pad->controllerType = in_type[pad_index];
int pad_index = pad->requestPadIndex;
pad->controllerType = in_type[pad_index];