Ginger Bill 8 years ago
parent
commit
7057034b75
3 changed files with 11 additions and 11 deletions
  1. 4 4
      core/os_linux.odin
  2. 6 6
      core/os_x.odin
  3. 1 1
      src/build_settings.c

+ 4 - 4
core/os_linux.odin

@@ -165,12 +165,12 @@ close :: proc(fd: Handle) {
 }
 }
 
 
 read :: proc(fd: Handle, data: []byte) -> (int, Errno) {
 read :: proc(fd: Handle, data: []byte) -> (int, Errno) {
-	sz := _unix_read(fd, ^data[0], len(data));
+	sz := _unix_read(fd, &data[0], len(data));
 	return sz, 0;
 	return sz, 0;
 }
 }
 
 
 write :: proc(fd: Handle, data: []byte) -> (int, Errno) {
 write :: proc(fd: Handle, data: []byte) -> (int, Errno) {
-	sz := _unix_write(fd, ^data[0], len(data));
+	sz := _unix_write(fd, &data[0], len(data));
 	return sz, 0;
 	return sz, 0;
 }
 }
 
 
@@ -194,7 +194,7 @@ stat :: proc(path: string) -> (Stat, int) #inline {
 	s: Stat;
 	s: Stat;
 	cstr := strings.new_c_string(path);
 	cstr := strings.new_c_string(path);
 	defer free(cstr);
 	defer free(cstr);
-	ret_int := _unix_stat(cstr, ^s);
+	ret_int := _unix_stat(cstr, &s);
 	return s, int(ret_int);
 	return s, int(ret_int);
 }
 }
 
 
@@ -271,7 +271,7 @@ exit :: proc(code: int) {
 }
 }
 
 
 current_thread_id :: proc() -> int {
 current_thread_id :: proc() -> int {
-	// return cast(int) _unix_gettid();
+	// return int(_unix_gettid());
 	return 0;
 	return 0;
 }
 }
 
 

+ 6 - 6
core/os_x.odin

@@ -67,7 +67,7 @@ Stat :: struct #ordered {
 	gen_num   : u32,  // File generation number ...?
 	gen_num   : u32,  // File generation number ...?
 	_spare    : i32,  // RESERVED
 	_spare    : i32,  // RESERVED
 	_reserve1,
 	_reserve1,
-	_reserve2 : i64,  // RESERVED 
+	_reserve2 : i64,  // RESERVED
 };
 };
 
 
 // File type
 // File type
@@ -147,7 +147,7 @@ unix_dlerror :: proc() -> ^u8
 
 
 // TODO(zangent): Change this to just `open` when Bill fixes overloading.
 // TODO(zangent): Change this to just `open` when Bill fixes overloading.
 open_simple :: proc(path: string, mode: int) -> (Handle, Errno) {
 open_simple :: proc(path: string, mode: int) -> (Handle, Errno) {
-	
+
 	cstr := strings.new_c_string(path);
 	cstr := strings.new_c_string(path);
 	handle := unix_open(cstr, mode);
 	handle := unix_open(cstr, mode);
 	free(cstr);
 	free(cstr);
@@ -169,7 +169,7 @@ close :: proc(fd: Handle) {
 write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 	assert(fd != -1);
 	assert(fd != -1);
 
 
-	bytes_written := unix_write(fd, ^data[0], len(data));
+	bytes_written := unix_write(fd, &data[0], len(data));
 	if(bytes_written == -1) {
 	if(bytes_written == -1) {
 		return 0, 1;
 		return 0, 1;
 	}
 	}
@@ -179,7 +179,7 @@ write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) {
 	assert(fd != -1);
 	assert(fd != -1);
 
 
-	bytes_read := unix_read(fd, ^data[0], len(data));
+	bytes_read := unix_read(fd, &data[0], len(data));
 	if(bytes_read == -1) {
 	if(bytes_read == -1) {
 		return 0, 1;
 		return 0, 1;
 	}
 	}
@@ -211,7 +211,7 @@ stat :: proc(path: string) -> (Stat, bool) #inline {
 	s: Stat;
 	s: Stat;
 	cstr := strings.new_c_string(path);
 	cstr := strings.new_c_string(path);
 	defer free(cstr);
 	defer free(cstr);
-	ret_int := unix_stat(cstr, ^s);
+	ret_int := unix_stat(cstr, &s);
 	return s, ret_int==0;
 	return s, ret_int==0;
 }
 }
 
 
@@ -309,4 +309,4 @@ dlclose :: proc(handle: rawptr) -> bool #inline {
 }
 }
 dlerror :: proc() -> string {
 dlerror :: proc() -> string {
 	return strings.to_odin_string(unix_dlerror());
 	return strings.to_odin_string(unix_dlerror());
-}
+}

+ 1 - 1
src/build_settings.c

@@ -263,7 +263,7 @@ String get_fullpath_core(gbAllocator a, String path) {
 void init_build_context(void) {
 void init_build_context(void) {
 	BuildContext *bc = &build_context;
 	BuildContext *bc = &build_context;
 	bc->ODIN_VENDOR  = str_lit("odin");
 	bc->ODIN_VENDOR  = str_lit("odin");
-	bc->ODIN_VERSION = str_lit("0.1.3");
+	bc->ODIN_VERSION = str_lit("0.2.0");
 	bc->ODIN_ROOT    = odin_root_dir();
 	bc->ODIN_ROOT    = odin_root_dir();
 
 
 #if defined(GB_SYSTEM_WINDOWS)
 #if defined(GB_SYSTEM_WINDOWS)