From 3b0a7e679acc6d1376b9e71b422b215ce959e7f0 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Mon, 15 Apr 2019 15:09:40 -0700 Subject: [PATCH] Add an option for __inline w.r.t. using a GHC compiler. --- wolfssl/wolfcrypt/settings.h | 6 ++++-- wolfssl/wolfcrypt/types.h | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 905d9f263..08a9af1e5 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -1276,12 +1276,14 @@ extern void uITRON4_free(void *p) ; ((CPU_CHAR *)Str_Cat_N((CPU_CHAR *)(pstr_dest), \ (const CPU_CHAR *)(pstr_cat),(CPU_SIZE_T)(len_max))) #define XMEMSET(pmem, data_val, size) \ - ((void)Mem_Set((void *)(pmem), (CPU_INT08U) (data_val), \ + ((void)Mem_Set((void *)(pmem), \ + (CPU_INT08U) (data_val), \ (CPU_SIZE_T)(size))) #define XMEMCPY(pdest, psrc, size) ((void)Mem_Copy((void *)(pdest), \ (void *)(psrc), (CPU_SIZE_T)(size))) #define XMEMCMP(pmem_1, pmem_2, size) \ - (((CPU_BOOLEAN)Mem_Cmp((void *)(pmem_1), (void *)(pmem_2), \ + (((CPU_BOOLEAN)Mem_Cmp((void *)(pmem_1), \ + (void *)(pmem_2), \ (CPU_SIZE_T)(size))) ? DEF_NO : DEF_YES) #define XMEMMOVE XMEMCPY diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index f5a19a26f..45ce4eeb8 100644 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -154,6 +154,12 @@ #define WC_INLINE inline #elif defined(THREADX) #define WC_INLINE _Inline + #elif defined(__ghc__) + #ifndef __cplusplus + #define WC_INLINE __inline + #else + #define WC_INLINE inline + #endif #else #define WC_INLINE #endif