summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--libpcsxcore/plugins.c8
2 files changed, 2 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bf81fa8..332ba0c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ July 7, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* configure.ac: Likewise.
* gui/Makefile.am: Likewise.
* plugins/dfcdrom/cdr-null.c: Likewise.
+ * libpcsxcore/plugins.c: Fixed plugin loading with FreeBSD.
July 4, 2010 edgbla <edgbla@yandex.ru>
diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 6b23e12e..f965e0d0 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -181,16 +181,10 @@ static const char *err;
if (err != NULL) { SysMessage(_("Error loading %s: %s"), func, err); return -1; } \
}
-#if defined (__MACOSX__)
#define LoadSym(dest, src, name, checkerr) { \
dest = (src)SysLoadSym(drv, name); \
if (checkerr) { CheckErr(name); } else SysLibError(); \
}
-#else
-#define LoadSym(dest, src, name, checkerr) { \
- dest = (src)SysLoadSym(drv, name); if (checkerr) { CheckErr(name); } \
-}
-#endif
void *hGPUDriver = NULL;
@@ -306,11 +300,11 @@ static int LoadCDRplugin(const char *CDRdll) {
LoadCdrSym1(getTD, "CDRgetTD");
LoadCdrSym1(readTrack, "CDRreadTrack");
LoadCdrSym1(getBuffer, "CDRgetBuffer");
+ LoadCdrSym1(getBufferSub, "CDRgetBufferSub");
LoadCdrSym0(play, "CDRplay");
LoadCdrSym0(stop, "CDRstop");
LoadCdrSym0(getStatus, "CDRgetStatus");
LoadCdrSym0(getDriveLetter, "CDRgetDriveLetter");
- LoadCdrSym1(getBufferSub, "CDRgetBufferSub");
LoadCdrSym0(configure, "CDRconfigure");
LoadCdrSym0(test, "CDRtest");
LoadCdrSym0(about, "CDRabout");