Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenMesh
OpenMesh
Commits
ec84b475
Commit
ec84b475
authored
May 30, 2016
by
Jan Möbius
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More MINGW compatibility changes
parent
ec12932e
Pipeline
#2054
passed with stage
in 78 minutes and 21 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 @
ec84b475
...
...
@@ -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 @
ec84b475
...
...
@@ -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"
{
...
...
Jan Möbius
@moebius
mentioned in commit
27965985
·
May 31, 2016
mentioned in commit
27965985
mentioned in commit 279659856af6050badd4853bec41fcc5e350c556
Toggle commit list
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