piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

PluginSpecs: Moved #define __cdecl outside _WIN32

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1884 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-01-17 08:21:49 +00:00
parent 2bc791a173
commit 8c3d4ac873
1 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Source/PluginSpecs/PluginSpecs.h
View File

@ -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__ #ifndef _PLUGINS_H_INCLUDED__
#define _PLUGINS_H_INCLUDED__ #define _PLUGINS_H_INCLUDED__
//////////////////////////////////////////////////////////////////////////////////////////
// Includes
// ------------
#ifdef _WIN32
#include <windows.h>
#endif
#include "CommonTypes.h" #include "CommonTypes.h"
///////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////
// Declarations and definitions
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#ifdef _WIN32 #ifdef _WIN32
#define EXPORT __declspec(dllexport) #define EXPORT __declspec(dllexport)
#define CALL __cdecl #define CALL __cdecl
#else #else
#define EXPORT __attribute__ ((visibility("default"))) #define EXPORT __attribute__ ((visibility("default")))
#define CALL #define CALL
#endif #define __cdecl
#define __cdecl #ifndef TRUE
#define TRUE 1
#define FALSE 0
#endif
#ifdef _WIN32 // simulate something that looks like win32
// long term, kill these
#include <windows.h> #define HWND void*
#define HINSTANCE void*
#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*
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
// plugin types // Plugin types
enum PLUGIN_TYPE { enum PLUGIN_TYPE {
PLUGIN_TYPE_VIDEO = 1, PLUGIN_TYPE_VIDEO = 1,
PLUGIN_TYPE_DVD, PLUGIN_TYPE_DVD,
@ -68,6 +71,8 @@ typedef struct
void *config; void *config;
void *messageLogger; void *messageLogger;
} PLUGIN_GLOBALS; } PLUGIN_GLOBALS;
///////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// GLOBAL I N T E R F A C E /////////////////////////////////////////////////// // GLOBAL I N T E R F A C E ///////////////////////////////////////////////////
@ -129,8 +134,11 @@ EXPORT void CALL Shutdown(void);
// input: mode // input: mode
// //
EXPORT void CALL DoState(unsigned char **ptr, int mode); EXPORT void CALL DoState(unsigned char **ptr, int mode);
///////////////////////////////
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif
#endif #endif
#endif // _PLUGINS_H_INCLUDED__