[Bf-blender-cvs] [dd51ec5] master: CLEW: Workaround compilation error on ppc64el

Sergey Sharybin noreply at git.blender.org
Mon Nov 21 21:05:25 CET 2016


Commit: dd51ec592f51c3f5787fe7527a81aae93a0b4b7c
Author: Sergey Sharybin
Date:   Mon Nov 21 21:03:34 2016 +0100
Branches: master
https://developer.blender.org/rBdd51ec592f51c3f5787fe7527a81aae93a0b4b7c

CLEW: Workaround compilation error on ppc64el

Something was conflicting here, causing C++ to consider bool as
a __vector(4) bool.

===================================================================

M	extern/clew/include/clew.h

===================================================================

diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h
index 1f79c12..2a583c8 100644
--- a/extern/clew/include/clew.h
+++ b/extern/clew/include/clew.h
@@ -369,7 +369,8 @@ typedef unsigned int cl_GLenum;
 #endif
 
 /* Define basic vector types */
-#if defined( __VEC__ )
+/* WOrkaround for ppc64el platform: conflicts with bool from C++. */
+#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
    typedef vector unsigned char     __cl_uchar16;
    typedef vector signed char       __cl_char16;




More information about the Bf-blender-cvs mailing list