aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorGinger Bill <bill@gingerbill.org>2017-01-17 20:27:14 +0000
committerGinger Bill <bill@gingerbill.org>2017-01-17 20:27:14 +0000
commit367d307dc48fb4ee6815141d2f22b69a0996eb66 (patch)
tree18257783e6bfa64d2b9982510bf2262d03948dab /core
parentcb59c1cf0805166d8b3230fea47d8674dacf157a (diff)
Fix conversion of untyped integers to pointers
Diffstat (limited to 'core')
-rw-r--r--core/atomic.odin1
-rw-r--r--core/sys/windows.odin4
2 files changed, 2 insertions, 3 deletions
diff --git a/core/atomic.odin b/core/atomic.odin
index 2ed69c438..cc381300e 100644
--- a/core/atomic.odin
+++ b/core/atomic.odin
@@ -29,7 +29,6 @@ fetch_add :: proc(a: ^i32, operand: i32) -> i32 {
}
fetch_and :: proc(a: ^i32, operand: i32) -> i32 {
return win32.InterlockedAnd(a, operand);
-
}
fetch_or :: proc(a: ^i32, operand: i32) -> i32 {
return win32.InterlockedOr(a, operand);
diff --git a/core/sys/windows.odin b/core/sys/windows.odin
index 959f96a54..df9f5aea7 100644
--- a/core/sys/windows.odin
+++ b/core/sys/windows.odin
@@ -19,7 +19,7 @@ BOOL :: i32;
WNDPROC :: type proc(HWND, u32, WPARAM, LPARAM) -> LRESULT #cc_c;
-INVALID_HANDLE_VALUE :: (-1 as int) as HANDLE;
+INVALID_HANDLE_VALUE :: ~int(0) as HANDLE;
FALSE: BOOL : 0;
TRUE: BOOL : 1;
@@ -46,7 +46,7 @@ WM_KEYUP :: 0x0101;
PM_REMOVE :: 1;
-COLOR_BACKGROUND :: 1 as HBRUSH;
+COLOR_BACKGROUND :: HBRUSH(int(1));
BLACK_BRUSH :: 4;
SM_CXSCREEN :: 0;