add void and remove rebase issue

This commit is contained in:
JacobBarthelmeh
2024-05-15 10:28:39 -06:00
parent d68f3cf63c
commit 9aeef1d857
2 changed files with 1 additions and 2 deletions

View File

@@ -918,7 +918,7 @@ void* wolfSSL_SetGlobalHeapHint(void* heap)
/* returns a pointer to the current global heap hint */ /* returns a pointer to the current global heap hint */
void* wolfSSL_GetGlobalHeapHint() void* wolfSSL_GetGlobalHeapHint(void)
{ {
return globalHeapHint; return globalHeapHint;
} }

View File

@@ -240,7 +240,6 @@ WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb* mf,
byte haFlag; /* flag used for checking handshake count */ byte haFlag; /* flag used for checking handshake count */
} WOLFSSL_HEAP_HINT; } WOLFSSL_HEAP_HINT;
WOLFSSL_API void wolfSSL_SetGlobalHeapHint(void* heap);
WOLFSSL_API void* wolfSSL_SetGlobalHeapHint(void* heap); WOLFSSL_API void* wolfSSL_SetGlobalHeapHint(void* heap);
WOLFSSL_API void* wolfSSL_GetGlobalHeapHint(void); WOLFSSL_API void* wolfSSL_GetGlobalHeapHint(void);
WOLFSSL_API int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint, WOLFSSL_API int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint,