From adc30bb5316688a6fc9933b30e9d5465e51cdd91 Mon Sep 17 00:00:00 2001
From: KeybadeBlox <fluorescencia@protonmail.com>
Date: Wed, 18 Feb 2026 19:22:13 -0500
Subject: [PATCH] Move Std.hpp into CRT directory

It's also been renamed to stddef.h since all it contained was the
definition of NULL, which lives in that header in a standard C library.
---
 decompile/Makefile                 |  6 +++---
 decompile/src/JSRF/Core.cpp        |  1 +
 decompile/src/JSRF/Core.hpp        |  2 +-
 decompile/src/JSRF/Jet2.cpp        |  1 +
 decompile/src/Smilebit/MMatrix.cpp |  2 +-
 decompile/src/Std.hpp              | 12 ------------
 decompile/src/XDK/CRT/stddef.h     |  8 ++++++++
 7 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 decompile/src/Std.hpp
 create mode 100644 decompile/src/XDK/CRT/stddef.h

diff --git a/decompile/Makefile b/decompile/Makefile
index 0be07a0..966ec93 100644
--- a/decompile/Makefile
+++ b/decompile/Makefile
@@ -38,11 +38,11 @@ src/JSRF/Jet2.exe: $(OBJ) $(LIB)
 
 
 # Header files used for each object
-src/JSRF/Jet2.obj: src/JSRF/Core.hpp src/Std.hpp src/XDK/D3D.h\
+src/JSRF/Jet2.obj: src/JSRF/Core.hpp src/XDK/CRT/stddef.h src/XDK/D3D.h\
                    src/XDK/Win32.h
 
-src/JSRF/Core.obj: src/JSRF/Core.hpp src/Smilebit/MMatrix.hpp src/Std.hpp\
-                   src/XDK/D3D.h src/XDK/Win32.h
+src/JSRF/Core.obj: src/JSRF/Core.hpp src/Smilebit/MMatrix.hpp\
+                   src/XDK/CRT/stddef.h src/XDK/D3D.h src/XDK/Win32.h
 
 src/JSRF/GameData.obj: src/JSRF/GameData.hpp
 
diff --git a/decompile/src/JSRF/Core.cpp b/decompile/src/JSRF/Core.cpp
index 6c0ca96..7561b8d 100644
--- a/decompile/src/JSRF/Core.cpp
+++ b/decompile/src/JSRF/Core.cpp
@@ -4,6 +4,7 @@ Game and GameObj classes that form the foundation of the JSRF game code.
 
 #pragma bss_seg(".data")
 
+#include "../XDK/CRT/stddef.h"
 #include "Core.hpp"
 
 // Declarations for symbols not yet defined in their own source files
diff --git a/decompile/src/JSRF/Core.hpp b/decompile/src/JSRF/Core.hpp
index 984d5fd..f335ed2 100644
--- a/decompile/src/JSRF/Core.hpp
+++ b/decompile/src/JSRF/Core.hpp
@@ -6,7 +6,7 @@ Game and GameObj classes that form the foundation of the JSRF game code.
 #define CORE_HPP
 
 #include "../Smilebit/MMatrix.hpp"
-#include "../Std.hpp"
+#include "../XDK/CRT/stddef.h"
 #include "../XDK/D3D.h"
 #include "../XDK/Win32.h"
 
diff --git a/decompile/src/JSRF/Jet2.cpp b/decompile/src/JSRF/Jet2.cpp
index 470c144..dbff36d 100644
--- a/decompile/src/JSRF/Jet2.cpp
+++ b/decompile/src/JSRF/Jet2.cpp
@@ -4,6 +4,7 @@ Main function.
 
 #pragma bss_seg(".data")
 
+#include "../XDK/CRT/stddef.h"
 #include "Core.hpp"
 
 
diff --git a/decompile/src/Smilebit/MMatrix.cpp b/decompile/src/Smilebit/MMatrix.cpp
index 1bc46d9..b4b4e09 100644
--- a/decompile/src/Smilebit/MMatrix.cpp
+++ b/decompile/src/Smilebit/MMatrix.cpp
@@ -6,7 +6,7 @@ Smilebit's stack-based matrix math library.
 #pragma bss_seg (".data"  )
 
 
-#include "../Std.hpp"
+#include "../XDK/CRT/stddef.h"
 #include "../XDK/Win32.h"
 #include "MMatrix.hpp"
 
diff --git a/decompile/src/Std.hpp b/decompile/src/Std.hpp
deleted file mode 100644
index 1f4fa01..0000000
--- a/decompile/src/Std.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/* JSRF Decompilation: Std.hpp
-C(++) standard library definitions.  Implemented in the repository instead of
-linking to an outside stdlib to ensure consistency (this may not actually be
-possible to accomplish, but we'll go for it for now).
-*/
-
-#ifndef STD_HPP
-#define STD_HPP
-
-#define NULL 0
-
-#endif
diff --git a/decompile/src/XDK/CRT/stddef.h b/decompile/src/XDK/CRT/stddef.h
new file mode 100644
index 0000000..07f5fa8
--- /dev/null
+++ b/decompile/src/XDK/CRT/stddef.h
@@ -0,0 +1,8 @@
+/* JSRF Decompilation: XDK/CRT/stddef.h */
+
+#ifndef STDDEF_H
+#define STDDEF_H
+
+#define NULL 0
+
+#endif