From d42e1feeb7f11d2b78e10ae8d85a6abddf8199de Mon Sep 17 00:00:00 2001
From: Allen Webster <editor@4coder.net>
Date: Thu, 25 Feb 2016 20:41:09 -0500
Subject: [PATCH] couple of linux tweaks

---
 4coder_custom.cpp |  2 +-
 linux_4ed.cpp     | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/4coder_custom.cpp b/4coder_custom.cpp
index 4cdb5d96..be76576b 100644
--- a/4coder_custom.cpp
+++ b/4coder_custom.cpp
@@ -76,7 +76,7 @@ HOOK_SIG(my_file_settings){
 
          push_parameter(app, cmd_context, par_lex_as_cpp_file, treat_as_code);
          push_parameter(app, cmd_context, par_wrap_lines, !treat_as_code);
-         push_parameter(app, cmd_context, par_key_mapid, (treat_as_code)?(my_code_map):(mapid_file));
+         push_parameter(app, cmd_context, par_key_mapid, (treat_as_code)?((int)my_code_map):((int)mapid_file));
          exec_command(cmd_context, cmdid_set_settings);
      }
 }
diff --git a/linux_4ed.cpp b/linux_4ed.cpp
index b0a0a292..0652f7ad 100644
--- a/linux_4ed.cpp
+++ b/linux_4ed.cpp
@@ -22,7 +22,12 @@
 #include "4ed_mem.cpp"
 #include "4ed_math.cpp"
 
-#include "4coder_custom.h"
+#include "4coder_custom.cpp"
+
+#undef exec_command
+#undef exec_command_keep_stack
+#undef clear_parameters
+
 #include "4ed_system.h"
 #include "4ed_rendering.h"
 #include "4ed.h"
@@ -1650,6 +1655,10 @@ main(int argc, char **argv)
     }
 #endif
     
+    if (linuxvars.custom_api.get_bindings == 0){
+        linuxvars.custom_api.get_bindings = get_bindings;
+    }
+    
     Thread_Context background[4] = {};
     linuxvars.groups[BACKGROUND_THREADS].threads = background;
     linuxvars.groups[BACKGROUND_THREADS].count = ArrayCount(background);