add void and remove rebase issue

JacobBarthelmeh · JacobBarthelmeh · commit 9aeef1d857f5 · 2024-05-15T10:28:39.000-06:00
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,

Original file line number	Diff line number	Diff line change
`@@ -918,7 +918,7 @@ void* wolfSSL_SetGlobalHeapHint(void* heap)`
`918`	`918`
`919`	`919`
`920`	`920`	`/* returns a pointer to the current global heap hint */`
`921`		`-void* wolfSSL_GetGlobalHeapHint()`
	`921`	`+void* wolfSSL_GetGlobalHeapHint(void)`
`922`	`922`	`{`
`923`	`923`	`return globalHeapHint;`
`924`	`924`	`}`