From 5c3dd4ebaf83932498108d67e760df85e5f05bb2 Mon Sep 17 00:00:00 2001
From: Allen Webster <allenwebster@Allens-MacBook-Pro.local>
Date: Thu, 26 Dec 2019 19:47:12 -0800
Subject: [PATCH] Get 4coder_types.h to work with a dumb hack for now

---
 platform_mac/mac_4ed.cpp | 4 ++--
 platform_mac/mac_4ed.mm  | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp
index 000d4336..b2636154 100644
--- a/platform_mac/mac_4ed.cpp
+++ b/platform_mac/mac_4ed.cpp
@@ -49,8 +49,8 @@
 
 ////////////////////////////////
 
-#define SLASH '\\'
-#define DLL "dll"
+#define SLASH '/'
+#define DLL "so"
 
 #include "4coder_hash_functions.cpp"
 #include "4coder_system_allocator.cpp"
diff --git a/platform_mac/mac_4ed.mm b/platform_mac/mac_4ed.mm
index 0e3e9485..c2519d04 100644
--- a/platform_mac/mac_4ed.mm
+++ b/platform_mac/mac_4ed.mm
@@ -2,10 +2,15 @@
 
 #include "4coder_base_types.h"
 
-#if 0
+#if 1
 #include "4coder_table.h"
 #include "4coder_events.h"
+// NOTE(allen): This is a very unfortunate hack, but hopefully there will never be a need to use the Marker
+// type in the platform layer. If that changes then instead change the name of Marker and make a transition
+// macro that is only included in custom code.
+#define Marker Marker__SAVE_THIS_IDENTIFIER
 #include "4coder_types.h"
+#undef Marker
 #endif
 
 #include "mac_objective_c_to_cpp_links.h"