commit 3043d5651c53c86ea843bf1e90d59417d8075839
author James Jones <jajones@nvidia.com> Wed Jul 07 13:59:12 2021 -0700
committer Alexander Galazin <Alexander.Galazin@arm.com> Fri Jul 16 09:30:55 2021 +0000
tree e7e2340bd6fcbbdf057665fbc3a7a596aa8ccd5c
parent ba8ede501547a07b7860ddc615f745a5b7e58ea5

Fix FreeBSD build of VK_EXT_physical_device_drm tests

Linux defines the major() and minor() macros in
the sys/sysmacros.h header, but FreeBSD does not
have this header and instead defines them in
sys/types.h.

Components: Vulkan
Affects: dEQP-VK.api.device_drm_properties.*

Change-Id: I0bed149d24241e152437f530f5eb137738c46122

external/vulkancts/modules/vulkan/api/vktApiDeviceDrmPropertiesTests.cpp

diff --git a/external/vulkancts/modules/vulkan/api/vktApiDeviceDrmPropertiesTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDeviceDrmPropertiesTests.cpp
index 882d11d..12ac828 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiDeviceDrmPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceDrmPropertiesTests.cpp
@@ -29,12 +29,16 @@
 #include "deDirectoryIterator.hpp"
 #include "deDynamicLibrary.hpp"
 #if DEQP_SUPPORT_DRM
+#if !defined(__FreeBSD__)
+// major() and minor() are defined in sys/types.h on FreeBSD, and in
+// sys/sysmacros.h on Linux and Solaris.
 #include <sys/sysmacros.h>
+#endif // !defined(__FreeBSD__)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <xf86drm.h>
-#endif
+#endif // DEQP_SUPPORT_DRM
 
 using namespace vk;