diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-09-22 22:48:45 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-09-22 22:48:45 +0200 |
| commit | 29d11bc97afb5932aa1d394a6df295a364d983a9 (patch) | |
| tree | e9d577f0b91627ff182ce4fcb14f4d94e5892138 /facetracknoir/plugin-support.h | |
| parent | d2809d533b7b0b85dec34fe31c1d4fa023cd5259 (diff) | |
get rid of evil CALLING_CONVENTION macro
Diffstat (limited to 'facetracknoir/plugin-support.h')
| -rw-r--r-- | facetracknoir/plugin-support.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/facetracknoir/plugin-support.h b/facetracknoir/plugin-support.h index 1e02bd60..3924fc09 100644 --- a/facetracknoir/plugin-support.h +++ b/facetracknoir/plugin-support.h @@ -2,20 +2,6 @@ #include "facetracknoir/plugin-api.hpp" -#if defined(_WIN32) -# define CALLING_CONVENTION_SUFFIX_VOID_FUNCTION "@0" -# ifdef _MSC_VER -# error "No support for MSVC anymore" -#else -# define MAYBE_STDCALL_UNDERSCORE "" -# endif -#else -# define CALLING_CONVENTION_SUFFIX_VOID_FUNCTION "" -# define MAYBE_STDCALL_UNDERSCORE "" -#endif - -#include <cstdio> - #include <QWidget> #include <QDebug> #include <QString> @@ -38,9 +24,9 @@ extern SelectedLibraries* Libraries; struct Metadata; -extern "C" typedef void* (CALLING_CONVENTION * CTOR_FUNPTR)(void); -extern "C" typedef Metadata* (CALLING_CONVENTION* METADATA_FUNPTR)(void); -extern "C" typedef void* (CALLING_CONVENTION* DIALOG_FUNPTR)(void); +extern "C" typedef void* (*CTOR_FUNPTR)(void); +extern "C" typedef Metadata* (*METADATA_FUNPTR)(void); +extern "C" typedef void* (*DIALOG_FUNPTR)(void); class DynamicLibrary { public: |