From ec1c2b16379d657db92c90e25b9e01393267b596 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 14 Sep 2013 18:51:32 +0200
Subject: Clean up preprocessor mingw-isms

No functional changes.
---
 compat/compat.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'compat/compat.h')

diff --git a/compat/compat.h b/compat/compat.h
index 7692b38a..6a95f167 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#if defined(_WIN32) || defined(__WIN32)
+#if defined(_WIN32)
 #include <windows.h>
 #else
 #include <stdio.h>
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #endif
 
-#if defined(IN_FTNOIR_COMPAT) && (defined(_WIN32) || defined(__WIN32))
+#if defined(IN_FTNOIR_COMPAT) && defined(_WIN32)
 #	define COMPAT_EXPORT __declspec(dllexport)
 #else
 #	define COMPAT_EXPORT
@@ -33,7 +33,7 @@ public:
     void unlock();
     void* mem;
 private:
-#if defined(_WIN32) || defined(__WIN32)
+#if defined(_WIN32)
     HANDLE hMutex, hMapFile;
 #else
     int fd, size;
-- 
cgit v1.2.3


From 74240d04b14cffc93693b0033b65907655fcf218 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 14 Sep 2013 19:46:28 +0200
Subject: Use __declspec(dllimport)

---
 compat/compat.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'compat/compat.h')

diff --git a/compat/compat.h b/compat/compat.h
index 6a95f167..c34add10 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -21,8 +21,10 @@
 
 #if defined(IN_FTNOIR_COMPAT) && defined(_WIN32)
 #	define COMPAT_EXPORT __declspec(dllexport)
+#elif defined(_WIN32)
+#	define COMPAT_EXPORT __declspec(dllimport)
 #else
-#	define COMPAT_EXPORT
+#   define COMPAT_EXPORT
 #endif
 
 class COMPAT_EXPORT PortableLockedShm {
-- 
cgit v1.2.3