Skip to content

Commit e5297c8

Browse files
authored
Merge pull request #18 from wolfSSL/wc_inline
Fix build issue with rename of `INLINE` to `WC_INLINE`.
2 parents 5ed33c7 + 60d39da commit e5297c8

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

wolfcrypt/src/async.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -963,13 +963,13 @@ int wc_AsyncThreadCreate(pthread_t *thread,
963963
uint32_t count;
964964
} cpu_set_t;
965965

966-
static INLINE void CPU_ZERO(cpu_set_t *cs) {
966+
static WC_INLINE void CPU_ZERO(cpu_set_t *cs) {
967967
cs->count = 0;
968968
}
969-
static INLINE void CPU_SET(int num, cpu_set_t *cs) {
969+
static WC_INLINE void CPU_SET(int num, cpu_set_t *cs) {
970970
cs->count |= (1 << num);
971971
}
972-
static INLINE int CPU_ISSET(int num, cpu_set_t *cs) {
972+
static WC_INLINE int CPU_ISSET(int num, cpu_set_t *cs) {
973973
return (cs->count & (1 << num));
974974
}
975975

wolfcrypt/src/port/cavium/cavium_nitrox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ int NitroxTranslateResponseCode(int ret)
9393
return ret;
9494
}
9595

96-
static INLINE void NitroxDevClear(WC_ASYNC_DEV* dev)
96+
static WC_INLINE void NitroxDevClear(WC_ASYNC_DEV* dev)
9797
{
9898
/* values that must be reset prior to calling algo */
9999
/* this is because operation may complete before added to event list */

wolfcrypt/src/port/intel/quickassist.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static void IntelQaStopPollingThread(WC_ASYNC_DEV* dev)
155155
/* Buffer Helpers */
156156
/* -------------------------------------------------------------------------- */
157157
#if defined(HAVE_ECC) || !defined(NO_DH)
158-
static INLINE int IntelQaBigIntToFlatBuffer(WC_BIGINT* src, CpaFlatBuffer* dst)
158+
static WC_INLINE int IntelQaBigIntToFlatBuffer(WC_BIGINT* src, CpaFlatBuffer* dst)
159159
{
160160
if (src == NULL || src->buf == NULL || dst == NULL) {
161161
return BAD_FUNC_ARG;
@@ -167,7 +167,7 @@ static INLINE int IntelQaBigIntToFlatBuffer(WC_BIGINT* src, CpaFlatBuffer* dst)
167167
return 0;
168168
}
169169

170-
static INLINE int IntelQaFlatBufferToBigInt(CpaFlatBuffer* src, WC_BIGINT* dst)
170+
static WC_INLINE int IntelQaFlatBufferToBigInt(CpaFlatBuffer* src, WC_BIGINT* dst)
171171
{
172172
if (src == NULL || src->pData == NULL || dst == NULL) {
173173
return BAD_FUNC_ARG;
@@ -749,7 +749,7 @@ int IntelQaGetCyInstanceCount(void)
749749
return g_numInstances;
750750
}
751751

752-
static INLINE int IntelQaHandleCpaStatus(WC_ASYNC_DEV* dev, CpaStatus status,
752+
static WC_INLINE int IntelQaHandleCpaStatus(WC_ASYNC_DEV* dev, CpaStatus status,
753753
int* ret, byte isAsync, void* callback, int* retryCount)
754754
{
755755
int retry = 0;
@@ -780,7 +780,7 @@ static INLINE int IntelQaHandleCpaStatus(WC_ASYNC_DEV* dev, CpaStatus status,
780780
return retry;
781781
}
782782

783-
static INLINE void IntelQaOpInit(WC_ASYNC_DEV* dev, IntelQaFreeFunc freeFunc)
783+
static WC_INLINE void IntelQaOpInit(WC_ASYNC_DEV* dev, IntelQaFreeFunc freeFunc)
784784
{
785785
dev->qat.ret = WC_PENDING_E;
786786
dev->qat.freeFunc = freeFunc;

wolfcrypt/src/port/intel/quickassist_mem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static void* qaeMemAllocNUMA(Cpa32U size, Cpa32U node, Cpa32U alignment,
222222
word16* p_page_offset);
223223
static void qaeMemFreeNUMA(void** ptr, word16 page_offset);
224224

225-
static INLINE int qaeMemTypeIsNuma(int type)
225+
static WC_INLINE int qaeMemTypeIsNuma(int type)
226226
{
227227
int isNuma = 0;
228228

0 commit comments

Comments
 (0)