aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Gavin <danielgavin5@hotmail.com>2022-07-27 09:39:08 +0200
committerDaniel Gavin <danielgavin5@hotmail.com>2022-07-27 09:39:08 +0200
commitbb30f33d507f9aa81a725d70b202821d634cd044 (patch)
tree49e30bc4df051d91ef213500b224b5c6b9d4350a /src
parent36cc9249e717c2f66848ea8d0be6c9363a6e9e50 (diff)
workaround odin bug
Diffstat (limited to 'src')
-rw-r--r--src/common/util_linux.odin6
-rw-r--r--src/common/util_windows.odin5
-rw-r--r--src/main.odin8
3 files changed, 13 insertions, 6 deletions
diff --git a/src/common/util_linux.odin b/src/common/util_linux.odin
new file mode 100644
index 0000000..203702e
--- /dev/null
+++ b/src/common/util_linux.odin
@@ -0,0 +1,6 @@
+package common
+
+import "core:mem/virtual"
+
+Growing_Arena :: virtual.Growing_Arena
+growing_arena_allocator :: virtual.growing_arena_allocator \ No newline at end of file
diff --git a/src/common/util_windows.odin b/src/common/util_windows.odin
index 716d4be..b877f4b 100644
--- a/src/common/util_windows.odin
+++ b/src/common/util_windows.odin
@@ -130,3 +130,8 @@ run_executable :: proc(command: string, stdout: ^[]byte) -> (u32, bool, []byte)
return exit_code, true, stdout[0:index]
}
+
+import "core:mem/virtual"
+
+Growing_Arena :: virtual.Growing_Arena
+growing_arena_allocator :: virtual.growing_arena_allocator \ No newline at end of file
diff --git a/src/main.odin b/src/main.odin
index 39651a7..a47f3b1 100644
--- a/src/main.odin
+++ b/src/main.odin
@@ -12,10 +12,6 @@ import "core:encoding/json"
import "core:reflect"
import "core:sync"
-when ODIN_OS != .Darwin {
- import "core:mem/virtual"
-}
-
import "core:intrinsics"
import "shared:server"
@@ -107,8 +103,8 @@ main :: proc() {
when ODIN_OS == .Darwin {
init_global_temporary_allocator(mem.Megabyte*100)
} else {
- growing_arena: virtual.Growing_Arena
- context.temp_allocator = virtual.growing_arena_allocator(&growing_arena)
+ growing_arena: common.Growing_Arena
+ context.temp_allocator = common.growing_arena_allocator(&growing_arena)
}
run(&reader, &writer)