Browse Source

Fix minor errors for *nix

Ginger Bill 8 years ago
parent
commit
d854c5003c
3 changed files with 3 additions and 3 deletions
  1. 1 1
      src/build_settings.cpp
  2. 1 1
      src/ir.cpp
  3. 1 1
      src/ssa.cpp

+ 1 - 1
src/build_settings.cpp

@@ -237,7 +237,7 @@ String path_to_fullpath(gbAllocator a, String s) {
 String path_to_fullpath(gbAllocator a, String s) {
 String path_to_fullpath(gbAllocator a, String s) {
 	char *p;
 	char *p;
 	gb_mutex_lock(&string_buffer_mutex);
 	gb_mutex_lock(&string_buffer_mutex);
-	p = realpath(cast(char *)s.data, 0);
+	p = realpath(cast(char *)s.text, 0);
 	gb_mutex_unlock(&string_buffer_mutex);
 	gb_mutex_unlock(&string_buffer_mutex);
 	if(p == nullptr) return make_string_c("");
 	if(p == nullptr) return make_string_c("");
 	return make_string_c(p);
 	return make_string_c(p);

+ 1 - 1
src/ir.cpp

@@ -3613,7 +3613,7 @@ String ir_mangle_name(irGen *s, String path, Entity *e) {
 			cast(char *)new_name, max_len,
 			cast(char *)new_name, max_len,
 			"%.*s-%u.%.*s",
 			"%.*s-%u.%.*s",
 			cast(int)base_len, base,
 			cast(int)base_len, base,
-			file->id,
+			cast(u32)file->id,
 			LIT(name));
 			LIT(name));
 	}
 	}
 	if (require_suffix_id) {
 	if (require_suffix_id) {

+ 1 - 1
src/ssa.cpp

@@ -2556,7 +2556,7 @@ String ssa_mangle_name(ssaModule *m, String path, Entity *e) {
 		cast(char *)new_name, max_len,
 		cast(char *)new_name, max_len,
 		"%.*s-%u.%.*s",
 		"%.*s-%u.%.*s",
 		cast(int)base_len, base,
 		cast(int)base_len, base,
-		file->id,
+		cast(u32)file->id,
 		LIT(name));
 		LIT(name));
 	if (is_overloaded) {
 	if (is_overloaded) {
 		char *str = cast(char *)new_name + new_name_len-1;
 		char *str = cast(char *)new_name + new_name_len-1;