Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
OpenMesh
Commits
27965985
Commit
27965985
authored
May 30, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More MINGW compatibility changes
(cherry picked from commit
ec84b475
)
parent
27b9cf58
Pipeline
#2076
passed with stage
in 65 minutes and 38 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
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.
src/OpenMesh/Tools/Utils/Timer.cc
View file @
27965985
...
@@ -88,7 +88,7 @@ public:
...
@@ -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)
...
@@ -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
...
...
src/OpenMesh/Tools/Utils/getopt.h
View file @
27965985
...
@@ -4,7 +4,7 @@
...
@@ -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"
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment