From b9b1f884a61cff1d576eb65e6ea80b5f3fe88880 Mon Sep 17 00:00:00 2001 From: Wenju He Date: Tue, 28 Jan 2025 16:33:16 +0000 Subject: [PATCH] [NFC][libclc] Fix clcfunc.h merge conflict resolve in b400aa4586c4 (#16809) These 4 macros were moved in 4602c16a6823, but added back by b400aa4586c4, resuling in duplicate definitions in this file. --- libclc/clc/include/clc/clcfunc.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libclc/clc/include/clc/clcfunc.h b/libclc/clc/include/clc/clcfunc.h index e07bcd0af0ebe..6c95a07b1c184 100644 --- a/libclc/clc/include/clc/clcfunc.h +++ b/libclc/clc/include/clc/clcfunc.h @@ -18,9 +18,4 @@ #define _CLC_DEF __attribute__((always_inline)) #endif -#define _CLC_INLINE __attribute__((always_inline)) inline -#define _CLC_CONVERGENT __attribute__((convergent)) -#define _CLC_PURE __attribute__((pure)) -#define _CLC_CONSTFN __attribute__((const)) - #endif // __CLC_CLCFUNC_H_