aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2018-03-04 11:38:49 +0000
committergingerBill <bill@gingerbill.org>2018-03-04 11:38:49 +0000
commitf4cf88c2ca4411d15fda754344f9ca7d3de6b8ab (patch)
tree4f67e960853e9746bf8c601f785925c547fe739a
parent6db95b554f4c480d6d30c061a0df3c174fb526b6 (diff)
Move os_*.odin files to os/
-rw-r--r--core/mem.odin4
-rw-r--r--core/os.odin8
-rw-r--r--core/os/essence.odin (renamed from core/os_essence.odin)0
-rw-r--r--core/os/linux.odin (renamed from core/os_linux.odin)0
-rw-r--r--core/os/osx.odin (renamed from core/os_x.odin)0
-rw-r--r--core/os/windows.odin (renamed from core/os_windows.odin)37
6 files changed, 24 insertions, 25 deletions
diff --git a/core/mem.odin b/core/mem.odin
index 7e50a4e66..b9550a77b 100644
--- a/core/mem.odin
+++ b/core/mem.odin
@@ -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 {
diff --git a/core/os.odin b/core/os.odin
index 4de19e031..6fbbabd94 100644
--- a/core/os.odin
+++ b/core/os.odin
@@ -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";
diff --git a/core/os_essence.odin b/core/os/essence.odin
index 1973500bb..1973500bb 100644
--- a/core/os_essence.odin
+++ b/core/os/essence.odin
diff --git a/core/os_linux.odin b/core/os/linux.odin
index 8d765df0a..8d765df0a 100644
--- a/core/os_linux.odin
+++ b/core/os/linux.odin
diff --git a/core/os_x.odin b/core/os/osx.odin
index 579aab073..579aab073 100644
--- a/core/os_x.odin
+++ b/core/os/osx.odin
diff --git a/core/os_windows.odin b/core/os/windows.odin
index 62f35740d..90674b594 100644
--- a/core/os_windows.odin
+++ b/core/os/windows.odin
@@ -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);
-
- 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;
+ 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]);
+ }
+
+ return arg_list;
}