unify other files

frasercrmck · frasercrmck · commit 229616dfe8f5 · 2025-01-22T10:59:21.000Z
diff --git a/libclc/clc/include/clc/integer/clc_clz.h b/libclc/clc/include/clc/integer/clc_clz.h
@@ -4,12 +4,12 @@
 #include <clc/clcfunc.h>
 #include <clc/clctypes.h>
 
-#define FUNCTION __clc_clz
-#define __CLC_BODY "unary_decl.h"
+#define __CLC_FUNCTION __clc_clz
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
 #include <clc/integer/gentype.inc>
 
 #undef __CLC_BODY
-#undef FUNCTION
+#undef __CLC_FUNCTION
 
 #endif // __CLC_INTEGER_CLC_CLZ_H__
diff --git a/libclc/clc/include/clc/integer/unary_decl.h b/libclc/clc/include/clc/integer/unary_decl.h
diff --git a/libclc/clc/include/clc/shared/binary_def.inc b/libclc/clc/include/clc/shared/binary_def.inc
@@ -1,6 +1,8 @@
 #include <clc/utils.h>
 
+#ifndef __CLC_FUNCTION
 #define __CLC_FUNCTION(x) __CLC_CONCAT(__clc_, x)
+#endif
 
 _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE a,
                                               __CLC_GENTYPE b) {
diff --git a/libclc/clc/include/clc/shared/ternary_def.inc b/libclc/clc/include/clc/shared/ternary_def.inc
@@ -1,6 +1,8 @@
 #include <clc/utils.h>
 
+#ifndef __CLC_FUNCTION
 #define __CLC_FUNCTION(x) __CLC_CONCAT(__clc_, x)
+#endif
 
 _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE a, __CLC_GENTYPE b,
                                               __CLC_GENTYPE c) {
diff --git a/libclc/clc/include/clc/shared/unary_decl.inc b/libclc/clc/include/clc/shared/unary_decl.inc
@@ -0,0 +1 @@
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x);
diff --git a/libclc/generic/include/clc/integer/clz.h b/libclc/generic/include/clc/integer/clz.h
@@ -1,6 +1,7 @@
-#define FUNCTION clz
-#define __CLC_BODY "unary_decl.h"
+#define __CLC_FUNCTION clz
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
 #include <clc/integer/gentype.inc>
 
-#undef FUNCTION
+#undef __CLC_BODY
+#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/integer/popcount.h b/libclc/generic/include/clc/integer/popcount.h
@@ -1,6 +1,7 @@
-#define FUNCTION popcount
-#define __CLC_BODY "unary_decl.h"
+#define __CLC_FUNCTION popcount
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
 #include <clc/integer/gentype.inc>
 
-#undef FUNCTION
+#undef __CLC_BODY
+#undef __CLC_FUNCTION
diff --git a/libclc/generic/lib/integer/hadd.cl b/libclc/generic/lib/integer/hadd.cl
@@ -2,6 +2,6 @@
 #include <clc/integer/clc_hadd.h>
 
 #define FUNCTION hadd
-#define __CLC_BODY "binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
 #include <clc/integer/gentype.inc>
diff --git a/libclc/generic/lib/integer/mad24.cl b/libclc/generic/lib/integer/mad24.cl
@@ -2,6 +2,6 @@
 #include <clc/integer/clc_mad24.h>
 
 #define FUNCTION mad24
-#define __CLC_BODY "ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
 #include <clc/integer/gentype24.inc>
diff --git a/libclc/generic/lib/integer/mad_hi.cl b/libclc/generic/lib/integer/mad_hi.cl
@@ -2,6 +2,6 @@
 #include <clc/integer/clc_mad_hi.h>
 
 #define FUNCTION mad_hi
-#define __CLC_BODY "ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
 #include <clc/integer/gentype.inc>
diff --git a/libclc/generic/lib/integer/mul24.cl b/libclc/generic/lib/integer/mul24.cl
@@ -2,6 +2,6 @@
 #include <clc/integer/clc_mul24.h>
 
 #define FUNCTION mul24
-#define __CLC_BODY "binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
 #include <clc/integer/gentype24.inc>
diff --git a/libclc/generic/lib/integer/mul_hi.cl b/libclc/generic/lib/integer/mul_hi.cl
@@ -2,6 +2,6 @@
 #include <clc/integer/clc_mul_hi.h>
 
 #define FUNCTION mul_hi
-#define __CLC_BODY "binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
 #include <clc/integer/gentype.inc>
diff --git a/libclc/generic/lib/integer/rhadd.cl b/libclc/generic/lib/integer/rhadd.cl
@@ -2,6 +2,6 @@
 #include <clc/integer/clc_rhadd.h>
 
 #define FUNCTION rhadd
-#define __CLC_BODY "binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
 #include <clc/integer/gentype.inc>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x);`