diff options
| author | gingerBill <bill@gingerbill.org> | 2023-04-26 15:28:37 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2023-04-26 15:28:37 +0100 |
| commit | 623d78952964273938c91c487ea39e381f2e4469 (patch) | |
| tree | 9c4ef7ab86d26ea2289da1cc02d1c46a0da508b1 | |
| parent | 827f36e2c07ca09d7822a8dc49ca1b34378801fb (diff) | |
| parent | d5772c939a73eaef82a8a012d5290447f04370c2 (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
| -rwxr-xr-x | build_odin.sh | 2 | ||||
| -rw-r--r-- | core/reflect/types.odin | 2 | ||||
| -rw-r--r-- | core/sys/windows/user32.odin | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/build_odin.sh b/build_odin.sh index 62943732f..9f4e7101a 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -157,7 +157,7 @@ run_demo() { } have_which() { - if ! [ -x "$(command -v which)" ]; then + if ! command -v which > /dev/null 2>&1 ; then panic "Could not find \`which\`" fi } diff --git a/core/reflect/types.odin b/core/reflect/types.odin index bfe894733..cad9b1f66 100644 --- a/core/reflect/types.odin +++ b/core/reflect/types.odin @@ -563,7 +563,7 @@ write_type_writer :: proc(w: io.Writer, ti: ^Type_Info, n_written: ^int = nil) - case .None: // Ignore case .Fixed: io.write_string(w, "#soa[", &n) or_return - io.write_i64(w, i64(info.soa_len), 10 &n) or_return + io.write_i64(w, i64(info.soa_len), 10) or_return io.write_byte(w, ']', &n) or_return write_type(w, info.soa_base_type, &n) or_return return diff --git a/core/sys/windows/user32.odin b/core/sys/windows/user32.odin index 05d6837dd..e8499a67b 100644 --- a/core/sys/windows/user32.odin +++ b/core/sys/windows/user32.odin @@ -38,6 +38,7 @@ foreign user32 { DestroyWindow :: proc(hWnd: HWND) -> BOOL --- ShowWindow :: proc(hWnd: HWND, nCmdShow: c_int) -> BOOL --- + IsWindow :: proc(hWnd: HWND) -> BOOL --- BringWindowToTop :: proc(hWnd: HWND) -> BOOL --- GetTopWindow :: proc(hWnd: HWND) -> HWND --- SetForegroundWindow :: proc(hWnd: HWND) -> BOOL --- |