diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-14 18:51:32 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-14 18:51:32 +0200 |
| commit | ec1c2b16379d657db92c90e25b9e01393267b596 (patch) | |
| tree | ddc7d62b0043da1261d729f817cfe8cbea4c600c /facetracknoir/global-settings.cpp | |
| parent | 38303ae6a79fc8dea560a2d2813fe1ea360e401d (diff) | |
Clean up preprocessor mingw-isms
No functional changes.
Diffstat (limited to 'facetracknoir/global-settings.cpp')
| -rw-r--r-- | facetracknoir/global-settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/facetracknoir/global-settings.cpp b/facetracknoir/global-settings.cpp index f605b591..4a655171 100644 --- a/facetracknoir/global-settings.cpp +++ b/facetracknoir/global-settings.cpp @@ -1,6 +1,6 @@ #include "global-settings.h" -#if !(defined(__WIN32) || defined(_WIN32)) +#if !(defined(_WIN32)) # include <dlfcn.h> #endif @@ -92,7 +92,7 @@ DynamicLibrary::DynamicLibrary(const QString& filename) { this->filename = filename; QString fullPath = QCoreApplication::applicationDirPath() + "/" + this->filename; -#if defined(__WIN32) || defined(_WIN32) +#if defined(_WIN32) handle = new QLibrary(fullPath); Dialog = (SETTINGS_FUNCTION) handle->resolve(MAYBE_STDCALL_UNDERSCORE "GetDialog" CALLING_CONVENTION_SUFFIX_VOID_FUNCTION); Constructor = (NULLARY_DYNAMIC_FUNCTION) handle->resolve(MAYBE_STDCALL_UNDERSCORE "GetConstructor" CALLING_CONVENTION_SUFFIX_VOID_FUNCTION); @@ -128,7 +128,7 @@ DynamicLibrary::DynamicLibrary(const QString& filename) DynamicLibrary::~DynamicLibrary() { -#if defined(__WIN32) || defined(_WIN32) +#if defined(_WIN32) handle->unload(); #else if (handle) |