Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More MINGW compatibility changes

Browse Source 
(cherry picked from commit ec84b4750a)
This commit is contained in:
Jan Möbius
2016-05-30 16:26:01 +02:00
parent 27b9cf584f
commit 279659856a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenMesh/Tools/Utils/Timer.cc
View File

@@ -88,7 +88,7 @@ public:
// compiler and os dependent implementation // compiler and os dependent implementation
// ------------------------------------------------------------- windows 32 ---- // ------------------------------------------------------------- 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 #ifndef DOXY_IGNORE_THIS
#include <windows.h> #include <windows.h>
@@ -263,7 +263,7 @@ void TimerImplStd::stop(void)
Timer::Timer(void) Timer::Timer(void)
{ {
#if defined(WIN32) && defined(_MSC_VER) #if defined(WIN32) && (defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined(__MINGW32__))
impl_ = new TimerImplWin32; impl_ = new TimerImplWin32;
#elif defined(__GNUC__) && defined(__POSIX__) #elif defined(__GNUC__) && defined(__POSIX__)
// CLOCK_REALTIME // CLOCK_REALTIME

2
src/OpenMesh/Tools/Utils/getopt.h
View File

@@ -4,7 +4,7 @@
#include <OpenMesh/Core/System/compiler.hh> #include <OpenMesh/Core/System/compiler.hh>
#include <OpenMesh/Core/System/OpenMeshDLLMacros.hh> #include <OpenMesh/Core/System/OpenMeshDLLMacros.hh>
#if defined(WIN32) #if defined(_MSC_VER)
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {