From a4ba194853bc53cd9f75db642956c350b42598ec Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Thu, 30 Mar 2017 11:27:20 -0400 Subject: [PATCH] building on MSVC 2017 --- 4coder_base_commands.cpp | 4 ++-- win32_4ed_fonts.cpp | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/4coder_base_commands.cpp b/4coder_base_commands.cpp index 81c0c25d..4ba226e4 100644 --- a/4coder_base_commands.cpp +++ b/4coder_base_commands.cpp @@ -883,8 +883,8 @@ CUSTOM_COMMAND_SIG(query_replace_identifier){ String r = replace.string; String w = with.string; - View_Summary view = get_active_view(app, AccessOpen); - Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessOpen); + view = get_active_view(app, AccessOpen); + buffer = get_buffer(app, view.buffer_id, AccessOpen); int32_t pos = range.start; Query_Bar bar; diff --git a/win32_4ed_fonts.cpp b/win32_4ed_fonts.cpp index f2807bc2..296069e5 100644 --- a/win32_4ed_fonts.cpp +++ b/win32_4ed_fonts.cpp @@ -115,12 +115,9 @@ Sys_Font_Init_Sig(system_font_init){ u32 dir_len = system_get_binary_path(&dir_str); Assert(dir_len < dir_max); - { - String dir_str = make_string_cap(directory, dir_len, dir_max); - set_last_folder_sc(&dir_str, "fonts", '\\'); - terminate_with_null(&dir_str); - dir_len = dir_str.size; - } + set_last_folder_sc(&dir_str, "fonts", '\\'); + terminate_with_null(&dir_str); + dir_len = dir_str.size; partition_reduce(scratch, dir_max - dir_len - 1); partition_align(scratch, 8);