projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e05d13
)
Fix compile error with MSVC 2015
author
rdb
<rdb@users.noreply.github.com>
Wed, 2 Nov 2016 17:42:16 +0000
(18:42 +0100)
committer
GitHub
<noreply@github.com>
Wed, 2 Nov 2016 17:42:16 +0000
(18:42 +0100)
This patch fixes compilation with MSVC 2015. WIN32 is not a preprocessor symbol that is defined by MSVC, but _WIN32 is.
contrib/Open3DGC/o3dgcTimer.h
patch
|
blob
|
history
diff --git
a/contrib/Open3DGC/o3dgcTimer.h
b/contrib/Open3DGC/o3dgcTimer.h
index
97f5759
..
00fe5b6
100644
(file)
--- a/
contrib/Open3DGC/o3dgcTimer.h
+++ b/
contrib/Open3DGC/o3dgcTimer.h
@@
-26,7
+26,7
@@
THE SOFTWARE.
#include "o3dgcCommon.h"
-#ifdef WIN32
+#ifdef
_
WIN32
/* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */
#define NOMINMAX
#include <windows.h>
@@
-42,7
+42,7
@@
THE SOFTWARE.
namespace o3dgc
{
-#ifdef WIN32
+#ifdef
_
WIN32
class Timer
{
public: