From: rdb <rdb@users.noreply.github.com>
Date: Wed, 2 Nov 2016 17:42:16 +0000 (+0100)
Subject: Fix compile error with MSVC 2015
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5c7c9c3ac65d89c8224f57c66572db871dda1e0;p=platform%2Fupstream%2Fassimp.git

Fix compile error with MSVC 2015

This patch fixes compilation with MSVC 2015.  WIN32 is not a preprocessor symbol that is defined by MSVC, but _WIN32 is.
---

diff --git a/contrib/Open3DGC/o3dgcTimer.h b/contrib/Open3DGC/o3dgcTimer.h
index 97f5759..00fe5b6 100644
--- 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: