Move os_*.odin files to os/

This commit is contained in:
gingerBill
2018-03-04 11:38:49 +00:00
parent 6db95b554f
commit f4cf88c2ca
6 changed files with 22 additions and 23 deletions

View File

@@ -38,8 +38,8 @@ slice_to_bytes :: proc "contextless" (slice: $E/[]$T) -> []byte {
}
ptr_to_bytes :: proc "contextless" (ptr: ^$T, len := 1) -> []byte {
assert(len >= 0);
return transmute([]byte)raw.Slice{ptr, len*size_of(T)};
assert(len >= 0);
return transmute([]byte)raw.Slice{ptr, len*size_of(T)};
}
any_to_bytes :: proc "contextless" (val: any) -> []byte {

View File

@@ -1,7 +1,7 @@
when ODIN_OS == "windows" do export "core:os_windows.odin";
when ODIN_OS == "osx" do export "core:os_x.odin";
when ODIN_OS == "linux" do export "core:os_linux.odin";
when ODIN_OS == "essence" do export "core:os_essence.odin";
when ODIN_OS == "windows" do export "core:os/windows.odin";
when ODIN_OS == "osx" do export "core:os/osx.odin";
when ODIN_OS == "linux" do export "core:os/linux.odin";
when ODIN_OS == "essence" do export "core:os/essence.odin";
import "mem.odin";

View File

@@ -260,26 +260,25 @@ current_thread_id :: proc() -> int {
_alloc_command_line_arguments :: proc() -> []string {
arg_count: i32;
arg_list_ptr := win32.command_line_to_argv_w(win32.get_command_line_w(), &arg_count);
arg_list := make([]string, int(arg_count));
for _, i in arg_list {
wc_str := (arg_list_ptr+i)^;
olen := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1,
nil, 0, nil, nil);
arg_count: i32;
arg_list_ptr := win32.command_line_to_argv_w(win32.get_command_line_w(), &arg_count);
arg_list := make([]string, int(arg_count));
for _, i in arg_list {
wc_str := (arg_list_ptr+i)^;
olen := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1,
nil, 0, nil, nil);
buf := make([]byte, olen);
n := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1,
cstring(&buf[0]), olen, nil, nil);
if n > 0 {
n -= 1;
}
arg_list[i] = string(buf[..n]);
}
buf := make([]byte, olen);
n := win32.wide_char_to_multi_byte(win32.CP_UTF8, 0, wc_str, -1,
cstring(&buf[0]), olen, nil, nil);
if n > 0 {
n -= 1;
}
arg_list[i] = string(buf[..n]);
}
return arg_list;
return arg_list;
}