merge from main

--HG--
branch : fuzz

1 files changed, 14 insertions, 3 deletions

diff --git a/dbmalloc.h b/dbmalloc.h
index f05f8f5..d5e814e 100644
--- a/dbmalloc.h
+++ b/dbmalloc.h
@@ -1,16 +1,27 @@
 #ifndef DBMALLOC_H_
 #define DBMALLOC_H_
 
-#include "includes.h"
+#include "stdint.h"
+#include "stdlib.h"
+#include "options.h"
 
 void * m_malloc(size_t size);
 void * m_calloc(size_t nmemb, size_t size);
 void * m_strdup(const char * str);
 void * m_realloc(void* ptr, size_t size);
-void m_free_direct(void* ptr);
-#define m_free(X) do {m_free_direct(X); (X) = NULL;} while (0)
 
+#if DROPBEAR_TRACKING_MALLOC
+void m_free_direct(void* ptr);
 void m_malloc_set_epoch(unsigned int epoch);
 void m_malloc_free_epoch(unsigned int epoch, int dofree);
 
+#else
+/* plain wrapper */
+#define m_free_direct free
+
+#endif
+
+#define m_free(X) do {m_free_direct(X); (X) = NULL;} while (0)
+
+
 #endif /* DBMALLOC_H_ */