diff options
| author | gingerBill <bill@gingerbill.org> | 2022-02-16 16:05:46 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2022-02-16 16:05:46 +0000 |
| commit | c76bdced552f2ec2fc78152115ef879bbe490e06 (patch) | |
| tree | 366871c9d36d40bfff5803ae17d6ce097b5e805d | |
| parent | 8e8a075a2232038eb3a24e2b7b0a0b183d13b89d (diff) | |
| parent | 459ea5f4f6bbd30b02eacb330d2e6c72392c69a6 (diff) | |
Merge branch 'master' into directx-packages
| -rw-r--r-- | src/check_type.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/check_type.cpp b/src/check_type.cpp index 6c49b9b8b..64fb67723 100644 --- a/src/check_type.cpp +++ b/src/check_type.cpp @@ -1932,7 +1932,7 @@ bool check_procedure_type(CheckerContext *ctx, Type *type, Ast *proc_type_node, switch (cc) { case ProcCC_StdCall: case ProcCC_FastCall: - if (arch != TargetArch_i386 || arch != TargetArch_amd64) { + if (arch != TargetArch_i386 && arch != TargetArch_amd64) { error(proc_type_node, "Invalid procedure calling convention \"%s\" for target architecture, expected either i386 or amd64, got %.*s", proc_calling_convention_strings[cc], LIT(target_arch_names[arch])); } |