Merge branch 'master' into cffi

7bbca22f · Andreas Klöckner · 8e2aaf5c · e929b209 · 7bbca22f
Commit 7bbca22f authored 10 years ago by Andreas Klöckner
--- a/pyopencl/scan.py
+++ b/pyopencl/scan.py
@@ -783,7 +783,7 @@ _IGNORED_WORDS = set("""
        pragma __attribute__ __global __kernel __local
        get_local_size get_local_id cl_khr_fp64 reqd_work_group_size
        get_num_groups barrier get_group_id
-        CL_VERSION_1_1 __OPENCL_VERSION__
+        CL_VERSION_1_1 __OPENCL_C_VERSION__ 120

        _final_update _debug_scan kernel_name