From: Frédéric Bonnard <frediz@debian.org>
Date: Mon, 11 May 2020 13:57:20 +0000 (+0200)
Subject: clover: Fix types collision between c++ and altivec
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cd7acd09b9f8cc68cbe50f9b239029efe7f9cd18;p=mesa.git

clover: Fix types collision between c++ and altivec

For that, we undefine bool, vector, pixel as advised by altivec.h in the
specific case that defines them.

Cc: mesa-stable
Signed-off-by: Frédéric Bonnard <frediz@debian.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4948>
---

diff --git a/src/gallium/frontends/clover/core/error.hpp b/src/gallium/frontends/clover/core/error.hpp
index 0490c19a276..e46c05b865b 100644
--- a/src/gallium/frontends/clover/core/error.hpp
+++ b/src/gallium/frontends/clover/core/error.hpp
@@ -24,6 +24,11 @@
 #define CLOVER_CORE_ERROR_HPP
 
 #include "CL/cl.h"
+#if defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__)
+   #undef vector
+   #undef pixel
+   #undef bool
+#endif
 
 #include <stdexcept>
 #include <string>