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 /compat | |
| parent | 38303ae6a79fc8dea560a2d2813fe1ea360e401d (diff) | |
Clean up preprocessor mingw-isms
No functional changes.
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/compat.cpp | 2 | ||||
| -rw-r--r-- | compat/compat.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compat/compat.cpp b/compat/compat.cpp index 8eedc845..d8aac9bc 100644 --- a/compat/compat.cpp +++ b/compat/compat.cpp @@ -7,7 +7,7 @@ #define IN_FTNOIR_COMPAT #include "compat.h" -#if defined(_WIN32) || defined(__WIN32) +#if defined(_WIN32) PortableLockedShm::PortableLockedShm(const char* shmName, const char* mutexName, int mapSize) { 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; |