From 9aeef1d857f5cee29f60021ed10be921057ffc05 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Wed, 15 May 2024 10:28:39 -0600 Subject: [PATCH] add void and remove rebase issue --- wolfcrypt/src/memory.c | 2 +- wolfssl/wolfcrypt/memory.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/wolfcrypt/src/memory.c b/wolfcrypt/src/memory.c index 2e30c4c81..43f9861b9 100644 --- a/wolfcrypt/src/memory.c +++ b/wolfcrypt/src/memory.c @@ -918,7 +918,7 @@ void* wolfSSL_SetGlobalHeapHint(void* heap) /* returns a pointer to the current global heap hint */ -void* wolfSSL_GetGlobalHeapHint() +void* wolfSSL_GetGlobalHeapHint(void) { return globalHeapHint; } diff --git a/wolfssl/wolfcrypt/memory.h b/wolfssl/wolfcrypt/memory.h index 87f277c70..a901a64c3 100644 --- a/wolfssl/wolfcrypt/memory.h +++ b/wolfssl/wolfcrypt/memory.h @@ -240,7 +240,6 @@ WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb* mf, byte haFlag; /* flag used for checking handshake count */ } WOLFSSL_HEAP_HINT; - WOLFSSL_API void wolfSSL_SetGlobalHeapHint(void* heap); WOLFSSL_API void* wolfSSL_SetGlobalHeapHint(void* heap); WOLFSSL_API void* wolfSSL_GetGlobalHeapHint(void); WOLFSSL_API int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint,