From 6e7a6754b1591e28fb85c1dbd0cfde2e05866501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Prokop=20Rand=C3=A1=C4=8Dek?= Date: Tue, 4 Jan 2022 11:33:05 +0000 Subject: Include bool type for C --- tools/buildHeaders/header.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/buildHeaders/header.cpp b/tools/buildHeaders/header.cpp index febc6f2..f2f16b3 100644 --- a/tools/buildHeaders/header.cpp +++ b/tools/buildHeaders/header.cpp @@ -513,6 +513,9 @@ namespace { } out << "#ifdef SPV_ENABLE_UTILITY_CODE" << std::endl; + out << "#ifndef __cplusplus" << std::endl; + out << "#include " << std::endl; + out << "#endif" << std::endl; out << "inline void " << pre() << "HasResultAndType(" << pre() << opName << " opcode, bool *hasResult, bool *hasResultType) {" << std::endl; out << " *hasResult = *hasResultType = false;" << std::endl; out << " switch (opcode) {" << std::endl; -- cgit v1.2.3 From e14816714e9a64cb3bc5243bf2e34ab978b07142 Mon Sep 17 00:00:00 2001 From: Prokop Randacek Date: Wed, 5 Jan 2022 19:02:52 +0100 Subject: regenerate the headers --- include/spirv/unified1/spirv.h | 3 +++ include/spirv/unified1/spirv.hpp | 3 +++ include/spirv/unified1/spirv.hpp11 | 3 +++ 3 files changed, 9 insertions(+) diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index c15736e..4f2c8d0 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -1843,6 +1843,9 @@ typedef enum SpvOp_ { } SpvOp; #ifdef SPV_ENABLE_UTILITY_CODE +#if !defined(__cplusplus) && !defined(bool) +# include +#endif inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultType) { *hasResult = *hasResultType = false; switch (opcode) { diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index 3d500eb..5b13f69 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -1839,6 +1839,9 @@ enum Op { }; #ifdef SPV_ENABLE_UTILITY_CODE +#if !defined(__cplusplus) && !defined(bool) +# include +#endif inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) { *hasResult = *hasResultType = false; switch (opcode) { diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index f1fd764..8ed05d3 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -1839,6 +1839,9 @@ enum class Op : unsigned { }; #ifdef SPV_ENABLE_UTILITY_CODE +#if !defined(__cplusplus) && !defined(bool) +# include +#endif inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) { *hasResult = *hasResultType = false; switch (opcode) { -- cgit v1.2.3 From bf985e99ecff8f2e25823c245edd2280b83d1901 Mon Sep 17 00:00:00 2001 From: Prokop Randacek Date: Tue, 8 Feb 2022 09:26:02 +0100 Subject: regenerate headers --- include/spirv/unified1/spirv.h | 4 ++-- include/spirv/unified1/spirv.hpp | 4 ++-- include/spirv/unified1/spirv.hpp11 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index 4f2c8d0..fa9828a 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -1843,8 +1843,8 @@ typedef enum SpvOp_ { } SpvOp; #ifdef SPV_ENABLE_UTILITY_CODE -#if !defined(__cplusplus) && !defined(bool) -# include +#ifndef __cplusplus +#include #endif inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultType) { *hasResult = *hasResultType = false; diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index 5b13f69..c3d2060 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -1839,8 +1839,8 @@ enum Op { }; #ifdef SPV_ENABLE_UTILITY_CODE -#if !defined(__cplusplus) && !defined(bool) -# include +#ifndef __cplusplus +#include #endif inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) { *hasResult = *hasResultType = false; diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index 8ed05d3..38e71c5 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -1839,8 +1839,8 @@ enum class Op : unsigned { }; #ifdef SPV_ENABLE_UTILITY_CODE -#if !defined(__cplusplus) && !defined(bool) -# include +#ifndef __cplusplus +#include #endif inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) { *hasResult = *hasResultType = false; -- cgit v1.2.3