From cb7f99ef79168a5e273f2dec670fbc6aebc40d2d Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Fri, 24 Dec 2021 16:40:43 +0100 Subject: [PATCH] Renamed macro INLINE to HC_INLINE to avoid naming conflict with INLINE on MacOS --- OpenCL/inc_vendor.h | 4 ++-- OpenCL/m10700-optimized.cl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenCL/inc_vendor.h b/OpenCL/inc_vendor.h index 480408921..989e1c756 100644 --- a/OpenCL/inc_vendor.h +++ b/OpenCL/inc_vendor.h @@ -130,8 +130,8 @@ #define DECLSPEC #endif -#define INLINE0 __attribute__ ((noinline)) -#define INLINE1 __attribute__ ((inline)) +#define HC_INLINE0 __attribute__ ((noinline)) +#define HC_INLINE1 __attribute__ ((inline)) /** * AMD specific diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl index 74d41ce1b..ef6ec2718 100644 --- a/OpenCL/m10700-optimized.cl +++ b/OpenCL/m10700-optimized.cl @@ -18,11 +18,11 @@ #define COMPARE_M "inc_comp_multi.cl" #if defined IS_AMD && defined IS_GPU -#define INLINE +#define HC_INLINE #elif defined IS_HIP -#define INLINE INLINE0 +#define HC_INLINE HC_INLINE0 #else -#define INLINE +#define HC_INLINE #endif typedef struct pdf @@ -323,7 +323,7 @@ DECLSPEC void make_w_with_offset (ctx_t *ctx, const u32 W_len, const u32 offset, } } -DECLSPEC INLINE u32 do_round (LOCAL_AS u32 *sc, const u32 *pw, const u32 pw_len, ctx_t *ctx, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) +DECLSPEC HC_INLINE u32 do_round (LOCAL_AS u32 *sc, const u32 *pw, const u32 pw_len, ctx_t *ctx, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) { // make scratch buffer