More MINGW compatibility changes

ec84b475 · Jan Möbius · ec12932e · ec84b475 · ec84b475
Commit ec84b475 authored May 30, 2016 by Jan Möbius
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

src/OpenMesh/Tools/Utils/Timer.cc src/OpenMesh/Tools/Utils/Timer.cc +2 -2

src/OpenMesh/Tools/Utils/getopt.h src/OpenMesh/Tools/Utils/getopt.h +1 -1

No files found.
--- 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

--- 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" {