1*4882a593SmuzhiyunFrom 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 31 May 2021 17:31:33 -0700 4*4882a593SmuzhiyunSubject: [PATCH] vulkancts: 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunO_TRUNC value in OperationId enum collides with the macro O_TRUNC 7*4882a593Smuzhiyundefined in the POSIX header fnctl.h. To avoid the collision undefine 8*4882a593SmuzhiyunO_TRUNC in this particular sourcefile before its is used in enums 9*4882a593Smuzhiyundown below. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunThis is fixed upstream differently 12*4882a593Smuzhiyunhttps://github.com/KhronosGroup/VK-GL-CTS/commit/564c6062f72fe7ecd92b4aea1558c441e651c76b 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunBut until we get this module uprev'ed to that, lets use a simpler 15*4882a593Smuzhiyunworkaround 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunUpstream-Status: Inappropriate [Fixed Differently] 18*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 4 ++++ 21*4882a593Smuzhiyun 1 file changed, 4 insertions(+) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp 24*4882a593Smuzhiyunindex 22e6c75fa..db7f4b54a 100644 25*4882a593Smuzhiyun--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp 26*4882a593Smuzhiyun+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp 27*4882a593Smuzhiyun@@ -38,6 +38,10 @@ 28*4882a593Smuzhiyun #include <limits> 29*4882a593Smuzhiyun #include <fenv.h> 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun+#ifdef O_TRUNC 32*4882a593Smuzhiyun+#undef O_TRUNC 33*4882a593Smuzhiyun+#endif 34*4882a593Smuzhiyun+ 35*4882a593Smuzhiyun namespace vkt 36*4882a593Smuzhiyun { 37*4882a593Smuzhiyun namespace SpirVAssembly 38*4882a593Smuzhiyun-- 39*4882a593Smuzhiyun2.31.1 40*4882a593Smuzhiyun 41