From ef2f49ff1966ee9a8d0475f72b92e41278ead319 Mon Sep 17 00:00:00 2001 From: Syoyo Fujita Date: Sun, 5 Nov 2017 17:18:46 +0900 Subject: [PATCH] User lowercase for Windows.h. Fixes #22. --- tiny_gltf.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tiny_gltf.h b/tiny_gltf.h index 901ade8..3df699c 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -661,15 +661,9 @@ class TinyGLTF { #pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wdisabled-macro-expansion" #pragma clang diagnostic ignored "-Wpadded" -#ifdef __APPLE__ -#if __clang_major__ >= 8 && __clang_minor__ >= 1 +#if __has_warning("-Wcomma") #pragma clang diagnostic ignored "-Wcomma" #endif -#else // __APPLE__ -#if (__clang_major__ >= 4) || (__clang_major__ >= 3 && __clang_minor__ > 8) -#pragma clang diagnostic ignored "-Wcomma" -#endif -#endif // __APPLE__ #endif #define PICOJSON_USE_INT64 @@ -680,7 +674,7 @@ class TinyGLTF { #endif #ifdef _WIN32 -#include +#include #elif !defined(__ANDROID__) #include #endif