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.cpp | |
| parent | d2809d533b7b0b85dec34fe31c1d4fa023cd5259 (diff) | |
get rid of evil CALLING_CONVENTION macro
Diffstat (limited to 'facetracknoir/plugin-support.cpp')
| -rw-r--r-- | facetracknoir/plugin-support.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/facetracknoir/plugin-support.cpp b/facetracknoir/plugin-support.cpp index c6622fe0..35cf8f29 100644 --- a/facetracknoir/plugin-support.cpp +++ b/facetracknoir/plugin-support.cpp @@ -1,11 +1,8 @@ +#include <cstdio> #include "plugin-support.h" #include <QCoreApplication> #include <QFile> -#if !(defined(_WIN32)) -# include <dlfcn.h> -#endif - SelectedLibraries* Libraries = NULL; SelectedLibraries::~SelectedLibraries() @@ -88,15 +85,15 @@ DynamicLibrary::DynamicLibrary(const QString& filename) : if (_foo::die(handle, !handle->load())) return; - Dialog = (DIALOG_FUNPTR) handle->resolve(MAYBE_STDCALL_UNDERSCORE "GetDialog" CALLING_CONVENTION_SUFFIX_VOID_FUNCTION); + Dialog = (DIALOG_FUNPTR) handle->resolve("GetDialog"); if (_foo::die(handle, !Dialog)) return; - Constructor = (CTOR_FUNPTR) handle->resolve(MAYBE_STDCALL_UNDERSCORE "GetConstructor" CALLING_CONVENTION_SUFFIX_VOID_FUNCTION); + Constructor = (CTOR_FUNPTR) handle->resolve("GetConstructor"); if (_foo::die(handle, !Constructor)) return; - Metadata = (METADATA_FUNPTR) handle->resolve(MAYBE_STDCALL_UNDERSCORE "GetMetadata" CALLING_CONVENTION_SUFFIX_VOID_FUNCTION); + Metadata = (METADATA_FUNPTR) handle->resolve("GetMetadata"); if (_foo::die(handle, !Metadata)) return; #else |