Fix compilation without SMARTALLOC

diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index 9235ab25c55a59026862dd795dd4e34dce15c89d..54add7bb3ffabdd5ebc4e43cdb82458236accfa6 100644 (file)
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -327,7 +327,14 @@ int cstrlen(const char *str)
    return len;
 }
 
-
+/* We need to disable the malloc() macro if SMARTALLOC is not used,
+ * else, it points to b_malloc() and causes problems.
+ */
+#ifndef SMARTALLOC
+ #ifdef malloc
+  #undef malloc
+ #endif
+#endif
 
 #ifndef bmalloc
 void *bmalloc(size_t size)