From 0c83d299f2a967ce8096fc9739f00c138ad435c1 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 14 Dec 2021 12:10:16 +0100
Subject: [PATCH] - removed compat.h entirely, all that was left was redundant
 #includes.

---
 source/build/include/build.h  |  1 -
 source/build/include/compat.h | 50 -----------------------------------
 source/core/searchpaths.cpp   |  1 +
 source/g_pch.h                |  3 +--
 4 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 source/build/include/compat.h

diff --git a/source/build/include/build.h b/source/build/include/build.h
index dc8447936..d9f4d94f5 100644
--- a/source/build/include/build.h
+++ b/source/build/include/build.h
@@ -15,7 +15,6 @@
 
 static_assert('\xff' == 255, "Char must be unsigned!");
 
-#include "compat.h"
 #include "printf.h"
 #include "palette.h"
 #include "binaryangle.h"
diff --git a/source/build/include/compat.h b/source/build/include/compat.h
deleted file mode 100644
index 6c26c999f..000000000
--- a/source/build/include/compat.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Compatibility declarations for things which might not be present in
-// certain build environments. It also levels the playing field caused
-// by different platforms.
-
-#ifndef compat_h_
-#define compat_h_
-
-#pragma once
-
-#include "xs_Float.h"
-#include "m_alloc.h"
-#include "intvec.h"
-#include "m_swap.h"
-#include "vectors.h"
-
-////////// Language and compiler feature polyfills //////////
-
-#include <inttypes.h>
-#include <stdint.h>
-
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if !(defined _WIN32 && defined __clang__)
-#include <float.h>
-#endif
-#include <math.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <time.h>
-
-#include <assert.h>
-
-# include <limits>
-#  include <algorithm>
-#  include <functional>
-#  include <type_traits>
-
-////////// Platform headers //////////
-
-#include "engineerrors.h"
-
-#include "basics.h"
-
-#endif // compat_h_
diff --git a/source/core/searchpaths.cpp b/source/core/searchpaths.cpp
index c29e1f739..ca6b6bf26 100644
--- a/source/core/searchpaths.cpp
+++ b/source/core/searchpaths.cpp
@@ -46,6 +46,7 @@
 #include "m_argv.h"
 #include "filesystem.h"
 #include "findfile.h"
+#include "engineerrors.h"
 
 static const char* res_exts[] = { ".grp", ".zip", ".pk3", ".pk4", ".7z", ".pk7" };
 
diff --git a/source/g_pch.h b/source/g_pch.h
index ea6b52316..efda66562 100644
--- a/source/g_pch.h
+++ b/source/g_pch.h
@@ -1,4 +1,3 @@
-/*
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -10,6 +9,7 @@
 #include <ctype.h>
 #include <stdint.h>
 #include <new>
+#include <type_traits>
 #include <algorithm>
 #include <forward_list>
 #include <sys/stat.h>
@@ -26,4 +26,3 @@
 // The overall savings from PCHing them are more significant.
 #include "tarray.h"
 #include "zstring.h"
-*/