From 162aa40f96aa23de0412fc0433616656c82bda29 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sun, 29 May 2022 03:30:41 -0700
Subject: [PATCH] Fix warnings on windows

---
 src/engine/math_util.h   | 8 ++++++++
 src/pc/network/network.c | 4 ++--
 src/pc/utils/misc.c      | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/engine/math_util.h b/src/engine/math_util.h
index 83c784c6..a4ee0641 100644
--- a/src/engine/math_util.h
+++ b/src/engine/math_util.h
@@ -27,6 +27,14 @@ extern f32 gCosineTable[];
 #define sins(x) gSineTable[(u16) (x) >> 4]
 #define coss(x) gCosineTable[(u16) (x) >> 4]
 
+#if defined(min)
+#undef min
+#endif
+
+#if defined(max)
+#undef max
+#endif
+
 #define min(a, b) ((a) <= (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
diff --git a/src/pc/network/network.c b/src/pc/network/network.c
index 902ae072..b4b8f4f4 100644
--- a/src/pc/network/network.c
+++ b/src/pc/network/network.c
@@ -4,7 +4,6 @@
 #include "object_fields.h"
 #include "object_constants.h"
 #include "behavior_table.h"
-#include "game/save_file.h"
 #include "src/game/hardcoded.h"
 #ifdef DISCORD_SDK
 #include "discord/discord.h"
@@ -19,7 +18,6 @@
 #include "pc/mods/mods.h"
 #include "pc/crash_handler.h"
 #include "pc/debuglog.h"
-#include "game/camera.h"
 
 // Mario 64 specific externs
 extern s16 sCurrPlayMode;
@@ -492,6 +490,7 @@ void network_shutdown(bool sendLeaving, bool exiting) {
     // reset other stuff
     extern u8* gOverrideEeprom;
     gOverrideEeprom = NULL;
+    extern u8 gOverrideFreezeCamera;
     gOverrideFreezeCamera = false;
     gDjuiHudLockMouse = false;
     dynos_mod_shutdown();
@@ -514,6 +513,7 @@ void network_shutdown(bool sendLeaving, bool exiting) {
     cnt->extStickX = 0;
     cnt->extStickY = 0;
 
+    extern void save_file_load_all(UNUSED u8 reload);
     save_file_load_all(TRUE);
 
     extern s16 gMenuMode;
diff --git a/src/pc/utils/misc.c b/src/pc/utils/misc.c
index 6ff52878..e21634aa 100644
--- a/src/pc/utils/misc.c
+++ b/src/pc/utils/misc.c
@@ -3,6 +3,7 @@
 #include <PR/ultratypes.h>
 #include <stdbool.h>
 #include <time.h>
+#include <float.h>
 
 #include "misc.h"