building on MSVC 2017

master
Allen Webster 2017-03-30 11:27:20 -04:00
parent 424bb2a52a
commit a4ba194853
2 changed files with 5 additions and 8 deletions

View File

@ -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;

View File

@ -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);