v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1053 from rdb/patch-2 

Fix compile error with MSVC 2015
pull/1056/head
Kim Kulling 2016-11-02 20:12:59 +01:00 committed by GitHub
parent 3e05d13827 b5c7c9c3ac
commit 413116a73b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/Open3DGC/o3dgcTimer.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include "o3dgcCommon.h" #include "o3dgcCommon.h"
#ifdef WIN32 #ifdef _WIN32
/* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */ /* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */
#define NOMINMAX #define NOMINMAX
#include <windows.h> #include <windows.h>
@ -42,7 +42,7 @@ THE SOFTWARE.
namespace o3dgc namespace o3dgc
{ {
#ifdef WIN32 #ifdef _WIN32
class Timer class Timer
{ {
public: public: