diff options
| author | Ginger Bill <bill@gingerbill.org> | 2017-08-11 00:16:57 +0100 |
|---|---|---|
| committer | Ginger Bill <bill@gingerbill.org> | 2017-08-11 00:16:57 +0100 |
| commit | d7bd3f8402e86d020ff5bb9dda3f9a2da2d3a07c (patch) | |
| tree | 414ffed3e9b176499fa7be104e30e3a9e4b63640 | |
| parent | 0fff6a2b74fb415e30a6b9ae104e204ffe799cbe (diff) | |
Fix compilation issues on OSX
| -rw-r--r-- | src/gb/gb.h | 8 | ||||
| -rw-r--r-- | src/ir.cpp | 2 | ||||
| -rw-r--r-- | src/parser.cpp | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/gb/gb.h b/src/gb/gb.h index de7af93c0..3386d529b 100644 --- a/src/gb/gb.h +++ b/src/gb/gb.h @@ -7984,15 +7984,17 @@ gb_inline b32 gb_file_copy(char const *existing_filename, char const *new_filena gb_inline b32 gb_file_move(char const *existing_filename, char const *new_filename) { if (link(existing_filename, new_filename) == 0) { - if (unlink(existing_filename) != -1) { - return true; - } + return unlink(existing_filename) != -1; } return false; } b32 gb_file_remove(char const *filename) { +#if defined(GB_SYSTEM_OSX) + return unlink(existing_filename) != -1; +#else return remove(filename) == 0; +#endif } diff --git a/src/ir.cpp b/src/ir.cpp index 791514047..93888588f 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -3603,7 +3603,7 @@ String ir_mangle_name(irGen *s, String path, Entity *e) { cast(char *)new_name, max_len, "_%.*s-%u.%.*s", cast(int)base_len, base, - file->id, + cast(u32)file->id, LIT(name)); } else { new_name_len = gb_snprintf( diff --git a/src/parser.cpp b/src/parser.cpp index fc4c40079..de2da964a 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -4759,7 +4759,7 @@ ParseFileError init_ast_file(AstFile *f, String fullpath) { TokenizerInitError err = init_tokenizer(&f->tokenizer, fullpath); if (err == TokenizerInit_None) { isize file_size = f->tokenizer.end - f->tokenizer.start; - isize init_token_cap = gb_max(next_pow2(file_size/2), 16); + isize init_token_cap = cast(isize)gb_max(next_pow2(cast(i64)(file_size/2ll)), 16); array_init(&f->tokens, heap_allocator(), gb_max(init_token_cap, 16)); for (;;) { |