From 8c3d4ac87366c5015b254f353454b364f732fba5 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Sat, 17 Jan 2009 08:21:49 +0000 Subject: [PATCH] PluginSpecs: Moved #define __cdecl outside _WIN32 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1884 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/PluginSpecs/PluginSpecs.h | 68 ++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/Source/PluginSpecs/PluginSpecs.h b/Source/PluginSpecs/PluginSpecs.h index bfd7a92e49..cf0ee89261 100644 --- a/Source/PluginSpecs/PluginSpecs.h +++ b/Source/PluginSpecs/PluginSpecs.h @@ -1,46 +1,49 @@ -//__________________________________________________________________________________________________ -// Common plugin spec, version #1.0 maintained by F|RES -// +////////////////////////////////////////////////////////////////////////////////////////// +//________________________________________________________________________________________ +// File description: Common plugin spec, version #1.0 maintained by F|RES +/////////////////////////// #ifndef _PLUGINS_H_INCLUDED__ #define _PLUGINS_H_INCLUDED__ + +////////////////////////////////////////////////////////////////////////////////////////// +// Includes +// ------------ +#ifdef _WIN32 + #include +#endif #include "CommonTypes.h" +/////////////////////////////// + +////////////////////////////////////////////////////////////////////////////////////////// +// Declarations and definitions +// ŻŻŻŻŻŻŻŻŻŻŻŻŻ #ifdef _WIN32 -#define EXPORT __declspec(dllexport) -#define CALL __cdecl + #define EXPORT __declspec(dllexport) + #define CALL __cdecl #else -#define EXPORT __attribute__ ((visibility("default"))) -#define CALL -#endif + #define EXPORT __attribute__ ((visibility("default"))) + #define CALL + #define __cdecl -#define __cdecl + #ifndef TRUE + #define TRUE 1 + #define FALSE 0 + #endif -#ifdef _WIN32 - -#include - -#else - -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - - -// simulate something that looks like win32 -// long term, kill these - -#define HWND void* -#define HINSTANCE void* + // simulate something that looks like win32 + // long term, kill these + #define HWND void* + #define HINSTANCE void* #endif #if defined(__cplusplus) -extern "C" { + extern "C" { #endif -// plugin types +// Plugin types enum PLUGIN_TYPE { PLUGIN_TYPE_VIDEO = 1, PLUGIN_TYPE_DVD, @@ -68,6 +71,8 @@ typedef struct void *config; void *messageLogger; } PLUGIN_GLOBALS; +/////////////////////////////// + /////////////////////////////////////////////////////////////////////////////// // GLOBAL I N T E R F A C E /////////////////////////////////////////////////// @@ -129,8 +134,11 @@ EXPORT void CALL Shutdown(void); // input: mode // EXPORT void CALL DoState(unsigned char **ptr, int mode); +/////////////////////////////// + #if defined(__cplusplus) -} -#endif + } #endif + +#endif // _PLUGINS_H_INCLUDED__