Skip to content

GitLab

Commit 27965985 authored by Jan Möbius's avatar Jan Möbius
Browse files

More MINGW compatibility changes 

(cherry picked from commit ec84b475)
parent 27b9cf58
Pipeline #2076 passed with stage
in 65 minutes and 38 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/OpenMesh/Tools/Utils/Timer.cc
View file @ 27965985
......@@ -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
......
src/OpenMesh/Tools/Utils/getopt.h
View file @ 27965985
......@@ -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" {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment