GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-07-07 06:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

User lowercase for Windows.h. Fixes #22.

Browse Source
This commit is contained in:
Syoyo Fujita 2017-11-05 17:18:46 +09:00
parent 57c1018f89
commit ef2f49ff19
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tiny_gltf.h
View File

@ -661,15 +661,9 @@ class TinyGLTF {
#pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wreserved-id-macro"
#pragma clang diagnostic ignored "-Wdisabled-macro-expansion" #pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
#pragma clang diagnostic ignored "-Wpadded" #pragma clang diagnostic ignored "-Wpadded"
#ifdef __APPLE__ #if __has_warning("-Wcomma")
#if __clang_major__ >= 8 && __clang_minor__ >= 1
#pragma clang diagnostic ignored "-Wcomma" #pragma clang diagnostic ignored "-Wcomma"
#endif #endif
#else // __APPLE__
#if (__clang_major__ >= 4) || (__clang_major__ >= 3 && __clang_minor__ > 8)
#pragma clang diagnostic ignored "-Wcomma"
#endif
#endif // __APPLE__
#endif #endif
#define PICOJSON_USE_INT64 #define PICOJSON_USE_INT64
@ -680,7 +674,7 @@ class TinyGLTF {
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <windows.h>
#elif !defined(__ANDROID__) #elif !defined(__ANDROID__)
#include <wordexp.h> #include <wordexp.h>
#endif #endif