From 586d041efe2328ce3d79bdee6e491a23a7ae1f68 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Thu, 29 Jun 2017 21:24:43 -0400 Subject: [PATCH] fixed objective-c to cpp linkage specifiers --- 4coder_project_commands.cpp | 5 ++--- osx_objective_c_to_cpp_links.h | 14 +++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/4coder_project_commands.cpp b/4coder_project_commands.cpp index ab502d50..e4dddabb 100644 --- a/4coder_project_commands.cpp +++ b/4coder_project_commands.cpp @@ -468,8 +468,7 @@ exec_project_fkey_command(Application_Links *app, int32_t command_ind){ Buffer_Identifier buffer_id = {0}; uint32_t flags = 0; - bool32 set_fancy_font = 0; - + bool32 set_fancy_font = false; if (out[0] != 0){ int32_t out_len = str_size(out); buffer_id = buffer_identifier(out, out_len); @@ -479,7 +478,7 @@ exec_project_fkey_command(Application_Links *app, int32_t command_ind){ if (use_build_panel){ view_ = get_or_open_build_panel(app); if (match(out, "*compilation*")){ - set_fancy_font = 1; + set_fancy_font = true; } } else{ diff --git a/osx_objective_c_to_cpp_links.h b/osx_objective_c_to_cpp_links.h index 13132f5b..20cdc62f 100644 --- a/osx_objective_c_to_cpp_links.h +++ b/osx_objective_c_to_cpp_links.h @@ -41,25 +41,25 @@ typedef struct OSX_Vars{ // In C++ layer. extern OSX_Vars osx; -internal void* +void* osx_allocate(umem size); -internal void +void osx_resize(int width, int height); -internal void +void osx_character_input(u32 code, OSX_Keyboard_Modifiers modifier_flags); -internal void +void osx_mouse(i32 mx, i32 my, u32 type); -internal void +void osx_mouse_wheel(float dx, float dy); -internal void +void osx_step(); -internal void +void osx_init(); // In Objective-C layer.