[libclc] 155/291: OpenCL 1.1 does not define CL_VERSION_1_2 so use hardcoded number instead

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository libclc.

commit 61127c58ffe9a798cf0b3403efe9b1bbfcb80a5f
Author: Jeroen Ketema <j.ketema at imperial.ac.uk>
Date:   Thu Jun 26 15:26:38 2014 +0000

    OpenCL 1.1 does not define CL_VERSION_1_2 so use hardcoded number instead
    
    Otherwise the test evaluates to true on OpenCL 1.1 and earlier. Since we
    therefore cannot use the CL_VERSION_?_? macros move them to the proper
    position in the top-level header.
    
    
    git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@211787 91177308-0d34-0410-b5e6-96231b3b80d8
---
 generic/include/clc/clc.h               | 6 +++---
 generic/include/clc/float/definitions.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h
index 109be82..96e090b 100644
--- a/generic/include/clc/clc.h
+++ b/generic/include/clc/clc.h
@@ -11,9 +11,6 @@
 /* Function Attributes */
 #include <clc/clcfunc.h>
 
-/* 6.9 Preprocessor Directives and Macros */
-#include <clc/clcversion.h>
-
 /* 6.1 Supported Data Types */
 #include <clc/clctypes.h>
 
@@ -23,6 +20,9 @@
 /* 6.2.4.2 Reinterpreting Types Using as_type() and as_typen() */
 #include <clc/as_type.h>
 
+/* 6.9 Preprocessor Directives and Macros */
+#include <clc/clcversion.h>
+
 /* 6.11.1 Work-Item Functions */
 #include <clc/workitem/get_global_size.h>
 #include <clc/workitem/get_global_id.h>
diff --git a/generic/include/clc/float/definitions.h b/generic/include/clc/float/definitions.h
index 6d532a5..18f2cbc 100644
--- a/generic/include/clc/float/definitions.h
+++ b/generic/include/clc/float/definitions.h
@@ -49,7 +49,7 @@
 
 #ifdef cl_khr_fp16
 
-#if __OPENCL_VERSION__ >= CL_VERSION_1_2
+#if __OPENCL_VERSION__ >= 120
 
 #define HALF_DIG        3
 #define HALF_MANT_DIG   11

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