Use -D__STDC_LIMIT_MACROS.

Avoids random #ifndef.

CMakeLists.txt

@@ -55,11 +55,17 @@ target_include_directories(spirv-cross-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 # However, we require the C++11 dialect.
 if (NOT "${MSVC}")
   set(spirv-compiler-options -std=c++11 -Wall -Wextra -Werror -Wshadow)
+  set(spirv-compiler-defines __STDC_LIMIT_MACROS)
   target_compile_options(spirv-cross-core PRIVATE ${spirv-compiler-options})
   target_compile_options(spirv-cross-glsl PRIVATE ${spirv-compiler-options})
   target_compile_options(spirv-cross-msl PRIVATE ${spirv-compiler-options})
   target_compile_options(spirv-cross-cpp PRIVATE ${spirv-compiler-options})
   target_compile_options(spirv-cross PRIVATE ${spirv-compiler-options})
+  target_compile_definitions(spirv-cross-core PRIVATE ${spirv-compiler-defines})
+  target_compile_definitions(spirv-cross-glsl PRIVATE ${spirv-compiler-defines})
+  target_compile_definitions(spirv-cross-msl PRIVATE ${spirv-compiler-defines})
+  target_compile_definitions(spirv-cross-cpp PRIVATE ${spirv-compiler-defines})
+  target_compile_definitions(spirv-cross PRIVATE ${spirv-compiler-defines})
 endif(NOT "${MSVC}")
 
 

Makefile

@@ -10,7 +10,7 @@ STATIC_LIB := lib$(TARGET).a
 
 DEPS := $(OBJECTS:.o=.d) $(CLI_OBJECTS:.o=.d)
 
-CXXFLAGS += -std=c++11 -Wall -Wextra -Wshadow
+CXXFLAGS += -std=c++11 -Wall -Wextra -Wshadow -D__STDC_LIMIT_MACROS
 
 ifeq ($(DEBUG), 1)
 	CXXFLAGS += -O0 -g

jni/Android.mk

@@ -7,5 +7,6 @@ LOCAL_MODULE := spirv-cross
 LOCAL_SRC_FILES := ../spirv_cfg.cpp ../spirv_cross.cpp ../spirv_glsl.cpp ../spirv_msl.cpp ../spirv_cpp.cpp
 LOCAL_CPP_FEATURES := exceptions
 LOCAL_ARM_MODE := arm
+LOCAL_CFLAGS := -D__STDC_LIMIT_MACROS
 
 include $(BUILD_STATIC_LIBRARY)

spirv_msl.hpp

@@ -21,10 +21,6 @@
 #include <set>
 #include <vector>
 
-#ifndef UINT32_MAX
-#define UINT32_MAX ((uint32_t)-1)
-#endif
-
 namespace spirv_cross
 {