Skip to content

Commit b9b1f88

Browse files
authored
[NFC][libclc] Fix clcfunc.h merge conflict resolve in b400aa4 (#16809)
These 4 macros were moved in 4602c16, but added back by b400aa4, resuling in duplicate definitions in this file.
1 parent a4aa7f0 commit b9b1f88

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

libclc/clc/include/clc/clcfunc.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,4 @@
1818
#define _CLC_DEF __attribute__((always_inline))
1919
#endif
2020

21-
#define _CLC_INLINE __attribute__((always_inline)) inline
22-
#define _CLC_CONVERGENT __attribute__((convergent))
23-
#define _CLC_PURE __attribute__((pure))
24-
#define _CLC_CONSTFN __attribute__((const))
25-
2621
#endif // __CLC_CLCFUNC_H_

0 commit comments

Comments
 (0)