summaryrefslogtreecommitdiffhomepage
path: root/facetracknoir/global-settings.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-09-14 18:51:32 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-09-14 18:51:32 +0200
commitec1c2b16379d657db92c90e25b9e01393267b596 (patch)
treeddc7d62b0043da1261d729f817cfe8cbea4c600c /facetracknoir/global-settings.h
parent38303ae6a79fc8dea560a2d2813fe1ea360e401d (diff)
Clean up preprocessor mingw-isms
No functional changes.
Diffstat (limited to 'facetracknoir/global-settings.h')
-rw-r--r--facetracknoir/global-settings.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/facetracknoir/global-settings.h b/facetracknoir/global-settings.h
index 29a8da62..b2a54e20 100644
--- a/facetracknoir/global-settings.h
+++ b/facetracknoir/global-settings.h
@@ -1,6 +1,6 @@
#pragma once
-#if defined(_WIN32) || defined(__WIN32)
+#if defined(_WIN32)
# define CALLING_CONVENTION_SUFFIX_VOID_FUNCTION "@0"
# ifdef _MSC_VER
# define MAYBE_STDCALL_UNDERSCORE "_"
@@ -21,7 +21,7 @@
#include "ftnoir_filter_base/ftnoir_filter_base.h"
#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
-#if defined(_WIN32) || defined(__WIN32)
+#if defined(_WIN32)
# define CALLING_CONVENTION __stdcall
#else
# define CALLING_CONVENTION
@@ -57,7 +57,7 @@ public:
METADATA_FUNCTION Metadata;
QString filename;
private:
-#if defined(_WIN32) || defined(__WIN32)
+#if defined(_WIN32)
QLibrary* handle;
#else
void* handle;