Selaa lähdekoodia

Fix compilation bug on Linux

Ginger Bill 8 vuotta sitten
vanhempi
commit
6b65ef6d88
3 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 1 1
      build.bat
  2. 3 2
      core/strconv.odin
  3. 1 1
      src/build_settings.cpp

+ 1 - 1
build.bat

@@ -42,10 +42,10 @@ set linker_settings=%libs% %linker_flags%
 del *.pdb > NUL 2> NUL
 del *.ilk > NUL 2> NUL
 
-rem odin run code/demo.odin
 cl %compiler_settings% "src\main.cpp" ^
 	/link %linker_settings% -OUT:%exe_name% ^
 	&& odin run code/demo.odin
+	rem && odin docs core/fmt.odin
 
 del *.obj > NUL 2> NUL
 

+ 3 - 2
core/strconv.odin

@@ -455,14 +455,15 @@ proc is_integer_negative(u: u128, is_signed: bool, bit_size: int) -> (unsigned:
 	return u, neg;
 }
 
-proc append_bits(buf: []u8, u_: u128, base: int, is_signed: bool, bit_size: int, digits: string, flags: IntFlag) -> string {
+proc append_bits(buf: []u8, u: u128, base: int, is_signed: bool, bit_size: int, digits: string, flags: IntFlag) -> string {
 	if base < 2 || base > MAX_BASE {
 		panic("strconv: illegal base passed to append_bits");
 	}
 
+	var neg: bool;
 	var a: [129]u8;
 	var i = len(a);
-	var u, neg = is_integer_negative(u_, is_signed, bit_size);
+	u, neg = is_integer_negative(u, is_signed, bit_size);
 	var b = u128(base);
 	for u >= b {
 		i--; a[i] = digits[uint(u % b)];

+ 1 - 1
src/build_settings.cpp

@@ -142,7 +142,7 @@ String odin_root_dir(void) {
 
 String odin_root_dir(void) {
 	String path = global_module_path;
-	Array(char) path_buf;
+	Array<char> path_buf;
 	isize len, i;
 	gbTempArenaMemory tmp;
 	u8 *text;