Skip to content

Fix build issue with rename of INLINE to WC_INLINE. #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toddouska merged 1 commit into from
Jul 13, 2018
Merged

Fix build issue with rename of INLINE to WC_INLINE. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions wolfcrypt/src/async.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion wolfcrypt/src/port/cavium/cavium_nitrox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
8 changes: 4 additions & 4 deletions wolfcrypt/src/port/intel/quickassist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion wolfcrypt/src/port/intel/quickassist_mem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down