diff options
| -rw-r--r-- | core/os_linux.odin | 8 | ||||
| -rw-r--r-- | core/os_x.odin | 12 | ||||
| -rw-r--r-- | src/build_settings.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/core/os_linux.odin b/core/os_linux.odin index 1de14b0f9..0ac376d69 100644 --- a/core/os_linux.odin +++ b/core/os_linux.odin @@ -165,12 +165,12 @@ close :: proc(fd: Handle) { } 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; } 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; } @@ -194,7 +194,7 @@ stat :: proc(path: string) -> (Stat, int) #inline { s: Stat; cstr := strings.new_c_string(path); defer free(cstr); - ret_int := _unix_stat(cstr, ^s); + ret_int := _unix_stat(cstr, &s); return s, int(ret_int); } @@ -271,7 +271,7 @@ exit :: proc(code: int) { } current_thread_id :: proc() -> int { - // return cast(int) _unix_gettid(); + // return int(_unix_gettid()); return 0; } diff --git a/core/os_x.odin b/core/os_x.odin index fc2bcd3d3..9fb138ae5 100644 --- a/core/os_x.odin +++ b/core/os_x.odin @@ -67,7 +67,7 @@ Stat :: struct #ordered { gen_num : u32, // File generation number ...? _spare : i32, // RESERVED _reserve1, - _reserve2 : i64, // RESERVED + _reserve2 : i64, // RESERVED }; // File type @@ -147,7 +147,7 @@ unix_dlerror :: proc() -> ^u8 // TODO(zangent): Change this to just `open` when Bill fixes overloading. open_simple :: proc(path: string, mode: int) -> (Handle, Errno) { - + cstr := strings.new_c_string(path); handle := unix_open(cstr, mode); free(cstr); @@ -169,7 +169,7 @@ close :: proc(fd: Handle) { write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) { 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) { return 0, 1; } @@ -179,7 +179,7 @@ write :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) { read :: proc(fd: Handle, data: []byte) -> (AddressSize, Errno) { 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) { return 0, 1; } @@ -211,7 +211,7 @@ stat :: proc(path: string) -> (Stat, bool) #inline { s: Stat; cstr := strings.new_c_string(path); defer free(cstr); - ret_int := unix_stat(cstr, ^s); + ret_int := unix_stat(cstr, &s); return s, ret_int==0; } @@ -309,4 +309,4 @@ dlclose :: proc(handle: rawptr) -> bool #inline { } dlerror :: proc() -> string { return strings.to_odin_string(unix_dlerror()); -}
\ No newline at end of file +} diff --git a/src/build_settings.c b/src/build_settings.c index fdae48dd3..683998e4e 100644 --- a/src/build_settings.c +++ b/src/build_settings.c @@ -263,7 +263,7 @@ String get_fullpath_core(gbAllocator a, String path) { void init_build_context(void) { BuildContext *bc = &build_context; 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(); #if defined(GB_SYSTEM_WINDOWS) |