add void and remove rebase issue

wolfSSL · May 15, 2024 · 9aeef1d · 9aeef1d
1 parent d68f3cf
commit 9aeef1d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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,