[oclgrind] 04/05: Undef problematic macros defined by altivec.h

[James Price]

This is an automated email from the git hooks/post-receive script.

jprice-guest pushed a commit to branch master
in repository oclgrind.

commit 6e27b37659539a2d5b1170b8c1507b7f05e4d287
Author: James Price <j.price at bristol.ac.uk>
Date:   Tue Dec 8 19:39:31 2015 +0000

    Undef problematic macros defined by altivec.h
---
 debian/patches/altivec-fix.patch | 44 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 45 insertions(+)

diff --git a/debian/patches/altivec-fix.patch b/debian/patches/altivec-fix.patch
new file mode 100644
index 0000000..80bcb73
--- /dev/null
+++ b/debian/patches/altivec-fix.patch
@@ -0,0 +1,44 @@
+Author: James Price <j.price at bristol.ac.uk>
+Description: Undef problematic macros defined by altivec.h
+Last-Update: 2015-12-08
+--- a/src/core/WorkItemBuiltins.cpp
++++ b/src/core/WorkItemBuiltins.cpp
+@@ -18,7 +18,6 @@
+ #include "llvm/IR/DebugInfoMetadata.h"
+ #endif
+ 
+-#include <CL/cl.h>
+ #include "Context.h"
+ #include "half.h"
+ #include "KernelInvocation.h"
+--- a/src/core/common.h
++++ b/src/core/common.h
+@@ -10,7 +10,14 @@
+ #define __common_h_
+ 
+ #include "config.h"
++
+ #include <CL/cl.h>
++
++// Make sure altivec macros are not defined
++#undef vector
++#undef pixel
++#undef bool
++
+ #include <cassert>
+ #include <cstdio>
+ #include <cstdlib>
+--- a/src/runtime/icd.h
++++ b/src/runtime/icd.h
+@@ -132,6 +132,11 @@
+ #include <CL/cl_dx9_media_sharing.h>
+ #endif
+ 
++// Make sure altivec macros are not defined
++#undef vector
++#undef pixel
++#undef bool
++
+ namespace oclgrind
+ {
+   class Context;
diff --git a/debian/patches/series b/debian/patches/series
index bc31e17..570b7f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ clang-library-order.patch
 cmake-preserve-flags.patch
 i386-shift-width.patch
 use-opencl-headers.patch
+altivec-fix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git