From 0f4b2413ec389747604402f3f9e7f42f9ab3049d Mon Sep 17 00:00:00 2001 From: pal1000 Date: Tue, 16 Nov 2021 11:04:51 +0200 Subject: [PATCH] aco: Work around MSVC restrict in c99_compat.h Future LLVM header leads to __declspec(__restrict), which is invalid. Just undefine the restrict macro to keep __declspec(restrict). Reviewed-by: Bas Nieuwenhuizen (cherry picked from commit e0de7aa4d7717bbd79bbc5bfc660f941f680402b) # Conflicts: # src/amd/compiler/aco_print_asm.cpp Part-of: --- src/amd/compiler/aco_print_asm.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp index dcc7c4bc747..413e6464c79 100644 --- a/src/amd/compiler/aco_print_asm.cpp +++ b/src/amd/compiler/aco_print_asm.cpp @@ -24,6 +24,9 @@ #include "aco_ir.h" +#if defined(_MSC_VER) && defined(restrict) +#undef restrict +#endif #include "llvm/ac_llvm_util.h" #include "llvm-c/Disassembler.h"