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

Update o3dgcTimer.h
This commit is contained in:
Kim Kulling
2018-01-03 01:24:21 +01:00
committed by GitHub

View File

@@ -30,7 +30,7 @@ THE SOFTWARE.
/* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */
#define NOMINMAX
#include <windows.h>
#elif __MACH__
#elif __APPLE__
#include <mach/clock.h>
#include <mach/mach.h>
#else
@@ -73,7 +73,7 @@ namespace o3dgc
LARGE_INTEGER m_freq;
};
#elif __MACH__
#elif __APPLE__
class Timer
{
public: