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

Merge pull request #1673 from assimp/kimkulling-patch-2 

Update o3dgcTimer.h
pull/1676/head^2
Kim Kulling 2018-01-03 01:24:21 +01:00 committed by GitHub
parent 837baabd36 cf59c7d153
commit fd91acdfc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -30,7 +30,7 @@ THE SOFTWARE.
/* 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>
#elif __MACH__ #elif __APPLE__
#include <mach/clock.h> #include <mach/clock.h>
#include <mach/mach.h> #include <mach/mach.h>
#else #else
@ -73,7 +73,7 @@ namespace o3dgc
LARGE_INTEGER m_freq; LARGE_INTEGER m_freq;
}; };
#elif __MACH__ #elif __APPLE__
class Timer class Timer
{ {
public: public: