From 279659856af6050badd4853bec41fcc5e350c556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Mon, 30 May 2016 16:26:01 +0200
Subject: [PATCH] More MINGW compatibility changes

(cherry picked from commit ec84b4750aa8a6045d78997d42ac4ac2970a2da3)
---
 src/OpenMesh/Tools/Utils/Timer.cc | 4 ++--
 src/OpenMesh/Tools/Utils/getopt.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OpenMesh/Tools/Utils/Timer.cc b/src/OpenMesh/Tools/Utils/Timer.cc
index 122f985e..3a82f4c1 100644
--- a/src/OpenMesh/Tools/Utils/Timer.cc
+++ b/src/OpenMesh/Tools/Utils/Timer.cc
@@ -88,7 +88,7 @@ public:
 // compiler and os dependent implementation
 
 // ------------------------------------------------------------- windows 32 ----
-#if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER))
+#if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined (__MINGW32__) )
 
 #ifndef DOXY_IGNORE_THIS
 #include <windows.h>
@@ -263,7 +263,7 @@ void TimerImplStd::stop(void)
 
 Timer::Timer(void)
 {
-#if defined(WIN32) && defined(_MSC_VER)
+#if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined(__MINGW32__)) 
   impl_       = new TimerImplWin32;
 #elif defined(__GNUC__) && defined(__POSIX__)
 // CLOCK_REALTIME
diff --git a/src/OpenMesh/Tools/Utils/getopt.h b/src/OpenMesh/Tools/Utils/getopt.h
index a156402e..59600d73 100644
--- a/src/OpenMesh/Tools/Utils/getopt.h
+++ b/src/OpenMesh/Tools/Utils/getopt.h
@@ -4,7 +4,7 @@
 #include <OpenMesh/Core/System/compiler.hh>
 #include <OpenMesh/Core/System/OpenMeshDLLMacros.hh>
 
-#if defined(WIN32)
+#if defined(_MSC_VER)
  #if   defined(__cplusplus)
  
   extern "C" {