diff options
| author | gingerBill <bill@gingerbill.org> | 2020-11-22 21:38:52 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2020-11-22 21:38:52 +0000 |
| commit | dc8e895d72ea82bf71fc1944e1ce9da60e56f84a (patch) | |
| tree | d2bdb73427870b2dcf63c75190203943f7d66771 | |
| parent | a2461bdf6b2e5ab9db5ded4206857df74ba4d1cd (diff) | |
| parent | 5cc9ddd40b9fc669c19613e0c35a95b7bc75b96f (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
| -rw-r--r-- | .github/workflows/nightly.yml | 4 | ||||
| -rw-r--r-- | core/sys/win32/kernel32.odin | 4 | ||||
| -rw-r--r-- | src/check_expr.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1648169e1..1b6d82eaf 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -51,7 +51,7 @@ jobs: - name: (Linux) Download LLVM run: sudo apt-get install llvm - name: build odin - run: make release + run: make nightly - name: Odin run run: ./odin run examples/demo/demo.odin - name: Copy artifacts @@ -77,7 +77,7 @@ jobs: TMP_PATH=$(xcrun --show-sdk-path)/user/include echo "CPATH=$TMP_PATH" >> $GITHUB_ENV - name: build odin - run: make release + run: make nightly - name: Odin run run: ./odin run examples/demo/demo.odin - name: Copy artifacts diff --git a/core/sys/win32/kernel32.odin b/core/sys/win32/kernel32.odin index d5cefad94..ba3898730 100644 --- a/core/sys/win32/kernel32.odin +++ b/core/sys/win32/kernel32.odin @@ -8,12 +8,12 @@ foreign kernel32 { @(link_name="CreateProcessA") create_process_a :: proc(application_name, command_line: cstring, process_attributes, thread_attributes: ^Security_Attributes, inherit_handle: Bool, creation_flags: u32, environment: rawptr, - current_direcotry: cstring, startup_info: ^Startup_Info, + current_directory: cstring, startup_info: ^Startup_Info, process_information: ^Process_Information) -> Bool ---; @(link_name="CreateProcessW") create_process_w :: proc(application_name, command_line: Wstring, process_attributes, thread_attributes: ^Security_Attributes, inherit_handle: Bool, creation_flags: u32, environment: rawptr, - current_direcotry: Wstring, startup_info: ^Startup_Info, + current_directory: Wstring, startup_info: ^Startup_Info, process_information: ^Process_Information) -> Bool ---; @(link_name="GetExitCodeProcess") get_exit_code_process :: proc(process: Handle, exit: ^u32) -> Bool ---; @(link_name="ExitProcess") exit_process :: proc(exit_code: u32) ---; diff --git a/src/check_expr.cpp b/src/check_expr.cpp index 24676b3ce..4b17b4f27 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -7659,7 +7659,7 @@ ExprKind check_call_expr(CheckerContext *c, Operand *operand, Ast *call, Ast *pr mix = arg->kind == Ast_FieldValue; } if (mix) { - error(arg, "Mixture of 'field = value' and value elements in a procedure all is not allowed"); + error(arg, "Mixture of 'field = value' and value elements in a procedure call is not allowed"); fail = true; } } |