From cd7acd09b9f8cc68cbe50f9b239029efe7f9cd18 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Bonnard?= <frediz@debian.org>
Date: Mon, 11 May 2020 15:57:20 +0200
Subject: [PATCH] clover: Fix types collision between c++ and altivec
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 src/gallium/frontends/clover/core/error.hpp | 5 +++++
 1 file changed, 5 insertions(+)

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>
-- 
2.30.2