From 984cf6f838311d1a6cece81eb387cb2387f2ba7c Mon Sep 17 00:00:00 2001
From: Open Toontown <57279094+opentoontown@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:34:19 -0500
Subject: [PATCH] Revert "general: Remove vestigial typedef.h file"

This reverts commit e4013226e112ade91d006936d771da4845e1c8c0.
---
 dtool/src/parser-inc/stdtypedefs.h      |  5 +++++
 panda/src/chan/partGroup.h              |  1 +
 panda/src/display/displayInformation.h  |  1 +
 panda/src/egg/lexerDefs.h               |  1 +
 panda/src/egg2pg/animBundleMaker.h      |  2 +-
 panda/src/egg2pg/characterMaker.h       |  1 +
 panda/src/event/eventParameter.h        |  1 +
 panda/src/express/CMakeLists.txt        |  2 +-
 panda/src/express/buffer.h              |  1 +
 panda/src/express/error_utils.h         |  1 +
 panda/src/express/hashVal.h             |  1 +
 panda/src/express/patchfile.h           |  1 +
 panda/src/express/pointerToBase.h       |  1 +
 panda/src/express/ramfile.h             |  1 +
 panda/src/express/trueClock.h           |  1 +
 panda/src/express/typedef.h             | 29 +++++++++++++++++++++++++
 panda/src/linmath/coordinateSystem.h    |  2 ++
 panda/src/parametrics/curveFitter.h     |  1 +
 panda/src/parametrics/parametricCurve.h |  1 +
 panda/src/putil/colorSpace.h            |  2 ++
 panda/src/putil/paramValue.h            |  1 +
 21 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 panda/src/express/typedef.h

diff --git a/dtool/src/parser-inc/stdtypedefs.h b/dtool/src/parser-inc/stdtypedefs.h
index d3fd7363d1..bd49086295 100644
--- a/dtool/src/parser-inc/stdtypedefs.h
+++ b/dtool/src/parser-inc/stdtypedefs.h
@@ -22,6 +22,11 @@
 typedef long time_t;
 typedef long clock_t;
 
+typedef unsigned int uint;
+typedef unsigned long ulong;
+typedef unsigned short ushort;
+typedef unsigned char uchar;
+
 #ifdef _WIN64
 #define __SIZE_TYPE__ unsigned long long
 #define __PTRDIFF_TYPE__ long long
diff --git a/panda/src/chan/partGroup.h b/panda/src/chan/partGroup.h
index 7c3cd47829..0dd9f8c7dd 100644
--- a/panda/src/chan/partGroup.h
+++ b/panda/src/chan/partGroup.h
@@ -19,6 +19,7 @@
 #include "typedWritableReferenceCount.h"
 #include "pointerTo.h"
 #include "namable.h"
+#include "typedef.h"
 #include "thread.h"
 #include "plist.h"
 #include "luse.h"
diff --git a/panda/src/display/displayInformation.h b/panda/src/display/displayInformation.h
index 3be788238b..2869c8320a 100644
--- a/panda/src/display/displayInformation.h
+++ b/panda/src/display/displayInformation.h
@@ -14,6 +14,7 @@
 #ifndef DISPLAYINFORMATION_H
 #define DISPLAYINFORMATION_H
 
+#include "typedef.h"
 #include "graphicsStateGuardian.h"
 
 struct EXPCL_PANDA_DISPLAY DisplayMode {
diff --git a/panda/src/egg/lexerDefs.h b/panda/src/egg/lexerDefs.h
index a618657527..8c0b4331f0 100644
--- a/panda/src/egg/lexerDefs.h
+++ b/panda/src/egg/lexerDefs.h
@@ -16,6 +16,7 @@
 
 #include "pandabase.h"
 #include "parserDefs.h"
+#include "typedef.h"
 
 #include <string>
 
diff --git a/panda/src/egg2pg/animBundleMaker.h b/panda/src/egg2pg/animBundleMaker.h
index 602675c209..5f19d92f8d 100644
--- a/panda/src/egg2pg/animBundleMaker.h
+++ b/panda/src/egg2pg/animBundleMaker.h
@@ -15,7 +15,7 @@
 #define ANIMBUNDLEMAKER_H
 
 #include "pandabase.h"
-#include "numeric_types.h"
+#include "typedef.h"
 
 class EggNode;
 class EggGroupNode;
diff --git a/panda/src/egg2pg/characterMaker.h b/panda/src/egg2pg/characterMaker.h
index dbbf8abb82..21163010a9 100644
--- a/panda/src/egg2pg/characterMaker.h
+++ b/panda/src/egg2pg/characterMaker.h
@@ -20,6 +20,7 @@
 #include "vertexSlider.h"
 #include "character.h"
 #include "vector_PartGroupStar.h"
+#include "typedef.h"
 #include "pmap.h"
 
 
diff --git a/panda/src/event/eventParameter.h b/panda/src/event/eventParameter.h
index 44e891e3c9..5f817fc149 100644
--- a/panda/src/event/eventParameter.h
+++ b/panda/src/event/eventParameter.h
@@ -16,6 +16,7 @@
 
 #include "pandabase.h"
 
+#include "typedef.h"
 #include "typedObject.h"
 #include "typedWritableReferenceCount.h"
 #include "pointerTo.h"
diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt
index 3168123ebc..fa4b8d6e2c 100644
--- a/panda/src/express/CMakeLists.txt
+++ b/panda/src/express/CMakeLists.txt
@@ -47,7 +47,7 @@ set(P3EXPRESS_HEADERS
   subfileInfo.h subfileInfo.I
   temporaryFile.h temporaryFile.I
   trueClock.I trueClock.h
-  typedReferenceCount.I typedReferenceCount.h
+  typedReferenceCount.I typedReferenceCount.h typedef.h
   virtualFileList.I virtualFileList.h
   virtualFileComposite.h virtualFileComposite.I
   virtualFile.h virtualFile.I
diff --git a/panda/src/express/buffer.h b/panda/src/express/buffer.h
index 6f0fd271cc..74f0f8d2b5 100644
--- a/panda/src/express/buffer.h
+++ b/panda/src/express/buffer.h
@@ -15,6 +15,7 @@
 #define BUFFER_H
 
 #include "pandabase.h"
+#include "typedef.h"
 #include "referenceCount.h"
 
 /**
diff --git a/panda/src/express/error_utils.h b/panda/src/express/error_utils.h
index a31b9319d5..0d4f22cd3f 100644
--- a/panda/src/express/error_utils.h
+++ b/panda/src/express/error_utils.h
@@ -15,6 +15,7 @@
 #define ERROR_UTILS_H
 
 #include "pandabase.h"
+#include "typedef.h"
 
 BEGIN_PUBLISH
 
diff --git a/panda/src/express/hashVal.h b/panda/src/express/hashVal.h
index 85b0cb8c3d..2b1a6b49ed 100644
--- a/panda/src/express/hashVal.h
+++ b/panda/src/express/hashVal.h
@@ -15,6 +15,7 @@
 #define HASHVAL_H
 
 #include "pandabase.h"
+#include "typedef.h"
 #include "pnotify.h"
 #include "ramfile.h"
 #include "datagram.h"
diff --git a/panda/src/express/patchfile.h b/panda/src/express/patchfile.h
index d6458fef58..852bd5b857 100644
--- a/panda/src/express/patchfile.h
+++ b/panda/src/express/patchfile.h
@@ -18,6 +18,7 @@
 
 #ifdef HAVE_OPENSSL
 
+#include "typedef.h"
 #include "pnotify.h"
 #include "filename.h"
 #include "plist.h"
diff --git a/panda/src/express/pointerToBase.h b/panda/src/express/pointerToBase.h
index 25994dd8db..832717e14e 100644
--- a/panda/src/express/pointerToBase.h
+++ b/panda/src/express/pointerToBase.h
@@ -17,6 +17,7 @@
 #include "pandabase.h"
 #include "pointerToVoid.h"
 #include "referenceCount.h"
+#include "typedef.h"
 #include "memoryUsage.h"
 #include "config_express.h"
 
diff --git a/panda/src/express/ramfile.h b/panda/src/express/ramfile.h
index 61fe382a6b..94df8fd3bf 100644
--- a/panda/src/express/ramfile.h
+++ b/panda/src/express/ramfile.h
@@ -15,6 +15,7 @@
 #define RAMFILE_H
 
 #include "pandabase.h"
+#include "typedef.h"
 #include "referenceCount.h"
 #include "extension.h"
 
diff --git a/panda/src/express/trueClock.h b/panda/src/express/trueClock.h
index 1ac82f2d35..4775d02498 100644
--- a/panda/src/express/trueClock.h
+++ b/panda/src/express/trueClock.h
@@ -15,6 +15,7 @@
 #define TRUECLOCK_H
 
 #include "pandabase.h"
+#include "typedef.h"
 #include "pdeque.h"
 #include "mutexImpl.h"
 #include "config_express.h"
diff --git a/panda/src/express/typedef.h b/panda/src/express/typedef.h
new file mode 100644
index 0000000000..5030e6d77f
--- /dev/null
+++ b/panda/src/express/typedef.h
@@ -0,0 +1,29 @@
+/**
+ * PANDA 3D SOFTWARE
+ * Copyright (c) Carnegie Mellon University.  All rights reserved.
+ *
+ * All use of this software is subject to the terms of the revised BSD
+ * license.  You should have received a copy of this license along
+ * with this source code in a file named "LICENSE."
+ *
+ * @file typedef.h
+ * @author mike
+ * @date 1997-01-09
+ */
+
+#ifndef TYPEDEF_H
+#define TYPEDEF_H
+
+#include "pandabase.h"
+#include "numeric_types.h"
+
+typedef unsigned char uchar;
+typedef unsigned short ushort;
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+typedef int64_t longlong;
+typedef uint64_t ulonglong;
+
+
+#endif
diff --git a/panda/src/linmath/coordinateSystem.h b/panda/src/linmath/coordinateSystem.h
index 6de6f90990..b365297f84 100644
--- a/panda/src/linmath/coordinateSystem.h
+++ b/panda/src/linmath/coordinateSystem.h
@@ -16,6 +16,8 @@
 
 #include "pandabase.h"
 
+#include "typedef.h"
+
 BEGIN_PUBLISH
 
 enum CoordinateSystem {
diff --git a/panda/src/parametrics/curveFitter.h b/panda/src/parametrics/curveFitter.h
index 8bb758ae56..0e63525ab8 100644
--- a/panda/src/parametrics/curveFitter.h
+++ b/panda/src/parametrics/curveFitter.h
@@ -20,6 +20,7 @@
 
 #include "parametricCurveCollection.h"
 
+#include "typedef.h"
 #include "pvector.h"
 
 class HermiteCurve;
diff --git a/panda/src/parametrics/parametricCurve.h b/panda/src/parametrics/parametricCurve.h
index ca8ee5aed7..0cb5d7fb9d 100644
--- a/panda/src/parametrics/parametricCurve.h
+++ b/panda/src/parametrics/parametricCurve.h
@@ -19,6 +19,7 @@
 #include "pandaNode.h"
 #include "luse.h"
 
+#include "typedef.h"
 #include "plist.h"
 #include "pvector.h"
 
diff --git a/panda/src/putil/colorSpace.h b/panda/src/putil/colorSpace.h
index 569ee2f8b8..9c9d237cc6 100644
--- a/panda/src/putil/colorSpace.h
+++ b/panda/src/putil/colorSpace.h
@@ -16,6 +16,8 @@
 
 #include "pandabase.h"
 
+#include "typedef.h"
+
 BEGIN_PUBLISH
 
 enum ColorSpace {
diff --git a/panda/src/putil/paramValue.h b/panda/src/putil/paramValue.h
index f7e4f207a1..ea3b8fcae5 100644
--- a/panda/src/putil/paramValue.h
+++ b/panda/src/putil/paramValue.h
@@ -16,6 +16,7 @@
 
 #include "pandabase.h"
 
+#include "typedef.h"
 #include "typedObject.h"
 #include "typedWritableReferenceCount.h"
 #include "pointerTo.h"