Browse Source

Merge branch 'master' of https://github.com/odin-lang/Odin

gingerBill 4 years ago
parent
commit
8077d5f565
2 changed files with 4 additions and 4 deletions
  1. 2 2
      core/path/filepath/path_unix.odin
  2. 2 2
      src/gb/gb.h

+ 2 - 2
core/path/filepath/path_unix.odin

@@ -34,8 +34,8 @@ abs :: proc(path: string, allocator := context.allocator) -> (string, bool) {
 	defer _unix_free(path_ptr);
 
 	path_cstr := cstring(path_ptr);
-	path = strings.clone(string(path_cstr), allocator);
-	return path, true;
+	path_str := strings.clone(string(path_cstr), allocator);
+	return path_str, true;
 }
 
 join :: proc(elems: ..string, allocator := context.allocator) -> string {

+ 2 - 2
src/gb/gb.h

@@ -491,8 +491,8 @@ typedef i32 b32; // NOTE(bill): Prefer this!!!
 	#define USIZE_MIX U32_MIN
 	#define USIZE_MAX U32_MAX
 
-	#define ISIZE_MIX S32_MIN
-	#define ISIZE_MAX S32_MAX
+	#define ISIZE_MIX I32_MIN
+	#define ISIZE_MAX I32_MAX
 #elif defined(GB_ARCH_64_BIT)
 	#define USIZE_MIX U64_MIN
 	#define USIZE_MAX U64_MAX