Skip to content

Commit

Permalink
[NFC][libclc] Fix clcfunc.h merge conflict resolve in b400aa4 (intel#…
Browse files Browse the repository at this point in the history
…16809)

These 4 macros were moved in 4602c16, but added back by
b400aa4, resuling in duplicate definitions in this file.
  • Loading branch information
wenju-he authored Jan 28, 2025
1 parent a4aa7f0 commit b9b1f88
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions libclc/clc/include/clc/clcfunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_

0 comments on commit b9b1f88

Please sign in to comment.