Browse Source

Merge branch 'master' of https://github.com/odin-lang/Odin

gingerBill 2 years ago
parent
commit
623d789529
3 changed files with 3 additions and 2 deletions
  1. 1 1
      build_odin.sh
  2. 1 1
      core/reflect/types.odin
  3. 1 0
      core/sys/windows/user32.odin

+ 1 - 1
build_odin.sh

@@ -157,7 +157,7 @@ run_demo() {
 }
 }
 
 
 have_which() {
 have_which() {
-	if ! [ -x "$(command -v which)" ]; then
+	if ! command -v which > /dev/null 2>&1 ; then
 		panic "Could not find \`which\`"
 		panic "Could not find \`which\`"
 	fi
 	fi
 }
 }

+ 1 - 1
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 .None: // Ignore
 		case .Fixed:
 		case .Fixed:
 			io.write_string(w, "#soa[",           &n) or_return
 			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
 			io.write_byte(w, ']',                 &n) or_return
 			write_type(w, info.soa_base_type,     &n) or_return
 			write_type(w, info.soa_base_type,     &n) or_return
 			return
 			return

+ 1 - 0
core/sys/windows/user32.odin

@@ -38,6 +38,7 @@ foreign user32 {
 	DestroyWindow :: proc(hWnd: HWND) -> BOOL ---
 	DestroyWindow :: proc(hWnd: HWND) -> BOOL ---
 
 
 	ShowWindow :: proc(hWnd: HWND, nCmdShow: c_int) -> BOOL ---
 	ShowWindow :: proc(hWnd: HWND, nCmdShow: c_int) -> BOOL ---
+	IsWindow :: proc(hWnd: HWND) -> BOOL ---
 	BringWindowToTop :: proc(hWnd: HWND) -> BOOL ---
 	BringWindowToTop :: proc(hWnd: HWND) -> BOOL ---
 	GetTopWindow :: proc(hWnd: HWND) -> HWND ---
 	GetTopWindow :: proc(hWnd: HWND) -> HWND ---
 	SetForegroundWindow :: proc(hWnd: HWND) -> BOOL ---
 	SetForegroundWindow :: proc(hWnd: HWND) -> BOOL ---