From 22fbca52cac7a4b32636fe7842f65b74266aeb90 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 25 Feb 2017 08:15:20 +0000
Subject: [PATCH] Remove HAVE_INTTYPES define.

No #else was ever provided for any build system that lacks inttypes besides MSVC.

git-svn-id: https://svn.eduke32.com/eduke32@6073 1a8010ca-5511-0410-912e-c29ae57300e0
---
 Android.mk                                    |  2 +-
 Common.mak                                    |  8 ++------
 .../Apple/EDuke32.xcodeproj/project.pbxproj   | 20 -------------------
 platform/Windows/eduke32.vcxproj              |  2 +-
 source/build/include/compat.h                 |  6 +++---
 5 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/Android.mk b/Android.mk
index 577a7ed87..8c6de458f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,7 @@ COMMONFLAGS     := -x c++ -std=gnu++11 -fvisibility=hidden -fPIC -funsigned-char
                    -W -Wall -Wextra -Wpointer-arith -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized \
                    -Wno-attributes -Wno-strict-overflow -Wno-unused-result -Wlogical-op -Wcast-qual -Werror=return-type \
                    -DHAVE_VORBIS -DHAVE_JWZGLES -DHAVE_ANDROID -DRENDERTYPESDL=1 -DMIXERTYPESDL=1 -DUSE_OPENGL -DNETCODE_DISABLE -DUSE_LIBVPX \
-                   -DHAVE_INTTYPES -D_GNU_SOURCE=1 -D_REENTRANT
+                   -D_GNU_SOURCE=1 -D_REENTRANT
 
 ifeq ($(FOUND_CLANG),1)
     COMMONFLAGS += -Wno-unknown-warning-option -Wno-deprecated-register
diff --git a/Common.mak b/Common.mak
index 7b8bd7f5f..1cfcf31a4 100644
--- a/Common.mak
+++ b/Common.mak
@@ -699,7 +699,6 @@ endif
 # endif
 
 ifeq ($(SUBPLATFORM),LINUX)
-    COMPILERFLAGS+= -DHAVE_INTTYPES
     GTKCOMPAT32=0
 
     ifeq ($(PLATFORM),GCW)
@@ -749,7 +748,6 @@ ifeq ($(PLATFORM),DARWIN)
         COMPILERFLAGS+= -I/sw/include
     endif
 
-    COMPILERFLAGS    += -DHAVE_INTTYPES
     DLLSUFFIX=.dylib
     GTKCOMPAT32    = 0
     WITHOUT_GTK   ?= 1
@@ -763,7 +761,7 @@ ifeq ($(PLATFORM),DARWIN)
     endif
 endif
 ifeq ($(PLATFORM),WINDOWS)
-    COMPILERFLAGS+= -DUNDERSCORES -DHAVE_INTTYPES -Iplatform/Windows/include
+    COMPILERFLAGS+= -DUNDERSCORES -Iplatform/Windows/include
     LINKERFLAGS+= -static-libgcc
     ifeq (0,$(CLANG))
         L_CXXONLYFLAGS += -static-libstdc++
@@ -795,8 +793,6 @@ else
 endif
 ifeq ($(PLATFORM),BSD)
     COMPILERFLAGS+= -I/usr/local/include
-
-    COMPILERFLAGS+= -DHAVE_INTTYPES
 endif
 ifeq ($(PLATFORM),BEOS)
     override NOASM=1
@@ -816,7 +812,7 @@ ifeq ($(PLATFORM),WII)
     override WITHOUT_GTK=1
     # -msdata=eabi
     COMMONFLAGS+= -g -mtune=750 -meabi -mhard-float
-    COMPILERFLAGS+= -DGEKKO -DHAVE_INTTYPES -D__POWERPC__ -I$(LIBOGC_INC) -I$(PORTLIBS)/include -Iplatform/Wii/include
+    COMPILERFLAGS+= -DGEKKO -D__POWERPC__ -I$(LIBOGC_INC) -I$(PORTLIBS)/include -Iplatform/Wii/include
     SDLCONFIG=
     SDL_TARGET=1
     LIBDIRS += -L$(LIBOGC_LIB) -L$(PORTLIBS)/lib -Lplatform/Wii/lib
diff --git a/platform/Apple/EDuke32.xcodeproj/project.pbxproj b/platform/Apple/EDuke32.xcodeproj/project.pbxproj
index 14025f091..fd9101cf2 100644
--- a/platform/Apple/EDuke32.xcodeproj/project.pbxproj
+++ b/platform/Apple/EDuke32.xcodeproj/project.pbxproj
@@ -2415,7 +2415,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -2529,7 +2528,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -2649,7 +2647,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -2763,7 +2760,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -2874,7 +2870,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -2977,7 +2972,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3083,7 +3077,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3183,7 +3176,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3288,7 +3280,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3387,7 +3378,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3525,7 +3515,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3625,7 +3614,6 @@
 					"-D_FORTIFY_SOURCE=2",
 					"-DUSE_LIBPNG",
 					"-DUSE_LIBVPX",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3735,7 +3723,6 @@
 					"-D_THREAD_SAFE",
 					"-DNO_GCC_BUILTINS",
 					"-D_FORTIFY_SOURCE=2",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3846,7 +3833,6 @@
 					"-D_THREAD_SAFE",
 					"-DNO_GCC_BUILTINS",
 					"-D_FORTIFY_SOURCE=2",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -3957,7 +3943,6 @@
 					"-D_THREAD_SAFE",
 					"-DNO_GCC_BUILTINS",
 					"-D_FORTIFY_SOURCE=2",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -4063,7 +4048,6 @@
 					"-D_THREAD_SAFE",
 					"-DNO_GCC_BUILTINS",
 					"-D_FORTIFY_SOURCE=2",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -4170,7 +4154,6 @@
 					"-D_THREAD_SAFE",
 					"-DNO_GCC_BUILTINS",
 					"-D_FORTIFY_SOURCE=2",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -4273,7 +4256,6 @@
 					"-D_THREAD_SAFE",
 					"-DNO_GCC_BUILTINS",
 					"-D_FORTIFY_SOURCE=2",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -4380,7 +4362,6 @@
 					"-D_THREAD_SAFE",
 					"-DNO_GCC_BUILTINS",
 					"-D_FORTIFY_SOURCE=2",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
@@ -4483,7 +4464,6 @@
 					"-D_THREAD_SAFE",
 					"-DNO_GCC_BUILTINS",
 					"-D_FORTIFY_SOURCE=2",
-					"-DHAVE_INTTYPES",
 					"-DSDL_TARGET=2",
 					"-DRENDERTYPESDL=1",
 					"-DMIXERTYPESDL=1",
diff --git a/platform/Windows/eduke32.vcxproj b/platform/Windows/eduke32.vcxproj
index ec6bf00ed..118cfecda 100644
--- a/platform/Windows/eduke32.vcxproj
+++ b/platform/Windows/eduke32.vcxproj
@@ -81,7 +81,7 @@
     <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine>
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">USE_OPENGL;POLYMER;NOASM;HAVE_INTTYPES;SDL_USEFOLDER;SDL_TARGET=2</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug-SDL|x64'">USE_OPENGL;POLYMER;NOASM;SDL_USEFOLDER;SDL_TARGET=2</NMakePreprocessorDefinitions>
     <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak WINBITS=64 RENDERTYPE=SDL</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak veryclean all WINBITS=64 RENDERTYPE=SDL</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release-SDL|x64'">nmake /f msvc.mak veryclean WINBITS=64 RENDERTYPE=SDL</NMakeCleanCommandLine>
diff --git a/source/build/include/compat.h b/source/build/include/compat.h
index d316a2572..603a45e59 100644
--- a/source/build/include/compat.h
+++ b/source/build/include/compat.h
@@ -293,11 +293,11 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 ||
 #ifndef __STDC_LIMIT_MACROS
 # define __STDC_LIMIT_MACROS
 #endif
-#if defined(HAVE_INTTYPES) || defined(__cplusplus)
+
+#if !defined _MSC_VER || defined __cplusplus
 # include <stdint.h>
 # include <inttypes.h>
-
-#elif defined(_MSC_VER)
+#else
 # include "msvc/inttypes.h" // from http://code.google.com/p/msinttypes/
 #endif