diff --git a/wolfcrypt/src/async.c b/wolfcrypt/src/async.c index 5e020d0..a47d3c0 100644 --- a/wolfcrypt/src/async.c +++ b/wolfcrypt/src/async.c @@ -963,13 +963,13 @@ int wc_AsyncThreadCreate(pthread_t *thread, uint32_t count; } cpu_set_t; - static INLINE void CPU_ZERO(cpu_set_t *cs) { + static WC_INLINE void CPU_ZERO(cpu_set_t *cs) { cs->count = 0; } - static INLINE void CPU_SET(int num, cpu_set_t *cs) { + static WC_INLINE void CPU_SET(int num, cpu_set_t *cs) { cs->count |= (1 << num); } - static INLINE int CPU_ISSET(int num, cpu_set_t *cs) { + static WC_INLINE int CPU_ISSET(int num, cpu_set_t *cs) { return (cs->count & (1 << num)); } diff --git a/wolfcrypt/src/port/cavium/cavium_nitrox.c b/wolfcrypt/src/port/cavium/cavium_nitrox.c index d6c403d..ea7532e 100644 --- a/wolfcrypt/src/port/cavium/cavium_nitrox.c +++ b/wolfcrypt/src/port/cavium/cavium_nitrox.c @@ -93,7 +93,7 @@ int NitroxTranslateResponseCode(int ret) return ret; } -static INLINE void NitroxDevClear(WC_ASYNC_DEV* dev) +static WC_INLINE void NitroxDevClear(WC_ASYNC_DEV* dev) { /* values that must be reset prior to calling algo */ /* this is because operation may complete before added to event list */ diff --git a/wolfcrypt/src/port/intel/quickassist.c b/wolfcrypt/src/port/intel/quickassist.c index 1a9178b..8dd8262 100644 --- a/wolfcrypt/src/port/intel/quickassist.c +++ b/wolfcrypt/src/port/intel/quickassist.c @@ -155,7 +155,7 @@ static void IntelQaStopPollingThread(WC_ASYNC_DEV* dev) /* Buffer Helpers */ /* -------------------------------------------------------------------------- */ #if defined(HAVE_ECC) || !defined(NO_DH) -static INLINE int IntelQaBigIntToFlatBuffer(WC_BIGINT* src, CpaFlatBuffer* dst) +static WC_INLINE int IntelQaBigIntToFlatBuffer(WC_BIGINT* src, CpaFlatBuffer* dst) { if (src == NULL || src->buf == NULL || dst == NULL) { return BAD_FUNC_ARG; @@ -167,7 +167,7 @@ static INLINE int IntelQaBigIntToFlatBuffer(WC_BIGINT* src, CpaFlatBuffer* dst) return 0; } -static INLINE int IntelQaFlatBufferToBigInt(CpaFlatBuffer* src, WC_BIGINT* dst) +static WC_INLINE int IntelQaFlatBufferToBigInt(CpaFlatBuffer* src, WC_BIGINT* dst) { if (src == NULL || src->pData == NULL || dst == NULL) { return BAD_FUNC_ARG; @@ -749,7 +749,7 @@ int IntelQaGetCyInstanceCount(void) return g_numInstances; } -static INLINE int IntelQaHandleCpaStatus(WC_ASYNC_DEV* dev, CpaStatus status, +static WC_INLINE int IntelQaHandleCpaStatus(WC_ASYNC_DEV* dev, CpaStatus status, int* ret, byte isAsync, void* callback, int* retryCount) { int retry = 0; @@ -780,7 +780,7 @@ static INLINE int IntelQaHandleCpaStatus(WC_ASYNC_DEV* dev, CpaStatus status, return retry; } -static INLINE void IntelQaOpInit(WC_ASYNC_DEV* dev, IntelQaFreeFunc freeFunc) +static WC_INLINE void IntelQaOpInit(WC_ASYNC_DEV* dev, IntelQaFreeFunc freeFunc) { dev->qat.ret = WC_PENDING_E; dev->qat.freeFunc = freeFunc; diff --git a/wolfcrypt/src/port/intel/quickassist_mem.c b/wolfcrypt/src/port/intel/quickassist_mem.c index 8707749..f930f0f 100644 --- a/wolfcrypt/src/port/intel/quickassist_mem.c +++ b/wolfcrypt/src/port/intel/quickassist_mem.c @@ -222,7 +222,7 @@ static void* qaeMemAllocNUMA(Cpa32U size, Cpa32U node, Cpa32U alignment, word16* p_page_offset); static void qaeMemFreeNUMA(void** ptr, word16 page_offset); -static INLINE int qaeMemTypeIsNuma(int type) +static WC_INLINE int qaeMemTypeIsNuma(int type) { int isNuma = 0;