ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #507 from PCSX2/stdcall-for-plugin 

Stdcall for plugin
This commit is contained in:
Gregory Hainaut 2015-04-19 18:48:32 +02:00
parent 1d70865f09 9ce7f515bc
commit 6fc9afb175
12 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/PS2Eext.h
View File

@ -30,7 +30,7 @@
#include <gtk/gtk.h>
#include <cstring>
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
//#include "PS2Edefs.h"

4
plugins/CDVDiso/src/CDVDiso.h
View File

@ -31,7 +31,7 @@
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
#else
@ -39,7 +39,7 @@
#ifdef _MSC_VER
#define EXPORT_C_(type) __declspec(dllexport) type __stdcall
#else
#define EXPORT_C_(type) __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
#endif

2
plugins/CDVDnull/CDVD.h
View File

@ -39,7 +39,7 @@
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
extern const unsigned char version;

2
plugins/GSdx/GSUtil.cpp
View File

@ -52,8 +52,6 @@ const char* GSUtil::GetLibName()
list<string> sl;
// TODO: linux (gcc)
#ifdef __INTEL_COMPILER
sl.push_back(format("Intel C++ %d.%02d", __INTEL_COMPILER / 100, __INTEL_COMPILER % 100));
#elif _MSC_VER

2
plugins/GSnull/GS.h
View File

@ -40,7 +40,7 @@ typedef struct _keyEvent keyEvent;
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
//#define GS_LOG GSLog::Log

2
plugins/LilyPad/Global.h
View File

@ -110,7 +110,7 @@ inline void * realloc(void *mem, size_t size);
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type CALLBACK
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type CALLBACK
#endif
#ifdef _MSC_VER

2
plugins/PadNull/Pad.h
View File

@ -37,7 +37,7 @@
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
#define PAD_LOG __Log

2
plugins/SPU2null/SPU2.h
View File

@ -39,7 +39,7 @@ extern "C"
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
extern FILE *spu2Log;

2
plugins/onepad/onepad.cpp
View File

@ -36,7 +36,7 @@
#endif
PADconf* conf;
char libraryName[256];
static char libraryName[256];
keyEvent event;

4
plugins/onepad/onepad.h
View File

@ -57,11 +57,9 @@ using namespace std;
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
extern char libraryName[256];
enum PadOptions
{
PADOPTION_FORCEFEEDBACK = 0x1,

2
plugins/spu2-x/src/PS2E-spu2.h
View File

@ -28,7 +28,7 @@
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
// We have our own versions that have the DLLExport attribute configured:

2
plugins/zzogl-pg/opengl/GS.h
View File

@ -35,7 +35,7 @@ extern float fFPS;
#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" type CALLBACK
#else
#define EXPORT_C_(type) extern "C" __attribute__((externally_visible,visibility("default"))) type
#define EXPORT_C_(type) extern "C" __attribute__((stdcall,externally_visible,visibility("default"))) type
#endif
extern int g_LastCRC;