diff options
| author | gingerBill <bill@gingerbill.org> | 2022-10-04 10:18:40 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2022-10-04 10:18:40 +0100 |
| commit | ee070c9bd3d5a33fc9f128cb67e905f6e7bf99db (patch) | |
| tree | 2075966e7387c0095d01842fbcca6f200b6e79a1 | |
| parent | aebafdcd086aafba8c40f54850dc2e11ff1113af (diff) | |
| parent | de8f6709f7a6d90d89a18b4ba2f177070397b684 (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
| -rw-r--r-- | .github/workflows/ci.yml | 7 | ||||
| -rw-r--r-- | core/sys/info/platform_darwin.odin | 1 | ||||
| -rw-r--r-- | core/sys/windows/kernel32.odin | 13 |
3 files changed, 13 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 558781a0a..0d8e10d59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -158,13 +158,6 @@ jobs: cd tests\core\math\big call build.bat timeout-minutes: 10 - - name: Odin issues tests - shell: cmd - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat - cd tests\issues - call run.bat - timeout-minutes: 10 - name: Odin check examples/all for Windows 32bits shell: cmd run: | diff --git a/core/sys/info/platform_darwin.odin b/core/sys/info/platform_darwin.odin index fe58d5b06..d226f668c 100644 --- a/core/sys/info/platform_darwin.odin +++ b/core/sys/info/platform_darwin.odin @@ -464,6 +464,7 @@ macos_release_map: map[string]Darwin_To_Release = { "21F2092" = {{21, 5, 0}, "macOS", {"Monterey", {12, 4, 0}}}, "21G72" = {{21, 6, 0}, "macOS", {"Monterey", {12, 5, 0}}}, "21G83" = {{21, 6, 0}, "macOS", {"Monterey", {12, 5, 1}}}, + "21G115" = {{21, 6, 0}, "macOS", {"Monterey", {12, 6, 0}}}, } @(private) diff --git a/core/sys/windows/kernel32.odin b/core/sys/windows/kernel32.odin index a9ed44d8a..9e5e5448b 100644 --- a/core/sys/windows/kernel32.odin +++ b/core/sys/windows/kernel32.odin @@ -963,4 +963,15 @@ DCB :: struct { foreign kernel32 { GetCommState :: proc(handle: HANDLE, dcb: ^DCB) -> BOOL --- SetCommState :: proc(handle: HANDLE, dcb: ^DCB) -> BOOL --- -}
\ No newline at end of file +} + + +LPFIBER_START_ROUTINE :: #type proc "stdcall" (lpFiberParameter: LPVOID) + +@(default_calling_convention = "stdcall") +foreign kernel32 { + CreateFiber :: proc(dwStackSize: SIZE_T, lpStartAddress: LPFIBER_START_ROUTINE, lpParameter: LPVOID) -> LPVOID --- + DeleteFiber :: proc(lpFiber: LPVOID) --- + ConvertThreadToFiber :: proc(lpParameter: LPVOID) -> LPVOID --- + SwitchToFiber :: proc(lpFiber: LPVOID) --- +} |