[libclc] 148/291: Move clcmacro.h to avoid cluttering user namespace v2

[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 f6ad9d66bb0d25ac2057798d3c400a0d7ac79c53
Author: Jeroen Ketema <j.ketema at imperial.ac.uk>
Date:   Tue Jun 24 09:36:32 2014 +0000

    Move clcmacro.h to avoid cluttering user namespace v2
    
    v2: - use quotes instead of <>
        - add include to r600/lib/math/nextafter.c changed
    
    Reviewed-by: Tom Stellard <tom at stellard.net>
    Reviewed-by: Aaron Watry <awatry at gmail.com>
    
    
    git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@211576 91177308-0d34-0410-b5e6-96231b3b80d8
---
 generic/include/clc/clc.h               | 3 ---
 generic/{include/clc => lib}/clcmacro.h | 0
 generic/lib/common/sign.cl              | 1 +
 generic/lib/integer/add_sat.cl          | 1 +
 generic/lib/integer/clz.cl              | 1 +
 generic/lib/integer/sub_sat.cl          | 1 +
 generic/lib/math/clc_nextafter.cl       | 1 +
 generic/lib/math/nextafter.cl           | 1 +
 generic/lib/math/pown.cl                | 1 +
 generic/lib/relational/isnan.cl         | 1 +
 r600/lib/math/nextafter.cl              | 1 +
 11 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h
index a975c0d..c7c8dfb 100644
--- a/generic/include/clc/clc.h
+++ b/generic/include/clc/clc.h
@@ -11,9 +11,6 @@
 /* Function Attributes */
 #include <clc/clcfunc.h>
 
-/* Pattern Macro Definitions */
-#include <clc/clcmacro.h>
-
 /* 6.1 Supported Data Types */
 #include <clc/clctypes.h>
 
diff --git a/generic/include/clc/clcmacro.h b/generic/lib/clcmacro.h
similarity index 100%
rename from generic/include/clc/clcmacro.h
rename to generic/lib/clcmacro.h
diff --git a/generic/lib/common/sign.cl b/generic/lib/common/sign.cl
index 070abd5..25832e0 100644
--- a/generic/lib/common/sign.cl
+++ b/generic/lib/common/sign.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 #define SIGN(TYPE, F) \
 _CLC_DEF _CLC_OVERLOAD TYPE sign(TYPE x) { \
diff --git a/generic/lib/integer/add_sat.cl b/generic/lib/integer/add_sat.cl
index 7eb4e39..d4df66d 100644
--- a/generic/lib/integer/add_sat.cl
+++ b/generic/lib/integer/add_sat.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From add_sat.ll
 _CLC_DECL char   __clc_add_sat_s8(char, char);
diff --git a/generic/lib/integer/clz.cl b/generic/lib/integer/clz.cl
index 83ef2dd..17e3fe0 100644
--- a/generic/lib/integer/clz.cl
+++ b/generic/lib/integer/clz.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From clz.ll
 _CLC_DECL char   __clc_clz_s8(char);
diff --git a/generic/lib/integer/sub_sat.cl b/generic/lib/integer/sub_sat.cl
index 9555b6d..6b42cc8 100644
--- a/generic/lib/integer/sub_sat.cl
+++ b/generic/lib/integer/sub_sat.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From sub_sat.ll
 _CLC_DECL char   __clc_sub_sat_s8(char, char);
diff --git a/generic/lib/math/clc_nextafter.cl b/generic/lib/math/clc_nextafter.cl
index 92b990d..e53837d 100644
--- a/generic/lib/math/clc_nextafter.cl
+++ b/generic/lib/math/clc_nextafter.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // This file provides OpenCL C implementations of nextafter for targets that
 // don't support the clang builtin.
diff --git a/generic/lib/math/nextafter.cl b/generic/lib/math/nextafter.cl
index 1a7f169..cbe54cd 100644
--- a/generic/lib/math/nextafter.cl
+++ b/generic/lib/math/nextafter.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_DEFINE_BINARY_BUILTIN(float, nextafter, __builtin_nextafterf, float, float)
 
diff --git a/generic/lib/math/pown.cl b/generic/lib/math/pown.cl
index 46b354b..f3b27d4 100644
--- a/generic/lib/math/pown.cl
+++ b/generic/lib/math/pown.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_BINARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, pown, float, int)
 
diff --git a/generic/lib/relational/isnan.cl b/generic/lib/relational/isnan.cl
index 1a64f67..ab5d58a 100644
--- a/generic/lib/relational/isnan.cl
+++ b/generic/lib/relational/isnan.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_DEFINE_UNARY_BUILTIN(int, isnan, __builtin_isnan, float)
 
diff --git a/r600/lib/math/nextafter.cl b/r600/lib/math/nextafter.cl
index 54bed5f..4611c81 100644
--- a/r600/lib/math/nextafter.cl
+++ b/r600/lib/math/nextafter.cl
@@ -1,3 +1,4 @@
 #include <clc/clc.h>
+#include "../lib/clcmacro.h"
 
 _CLC_DEFINE_BINARY_BUILTIN(float, nextafter, __clc_nextafter, float, float)

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