summaryrefslogtreecommitdiffstats
path: root/source/mem_man/mem_man.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1999-12-13 13:27:58 +0000
committerAndrew Tridgell <tridge@samba.org>1999-12-13 13:27:58 +0000
commit453a822a76780063dff23526c35408866d0c0154 (patch)
tree804feffcd5e60153e27d3ca2b007021e66e5bd0a /source/mem_man/mem_man.h
parent054195df9b6187c663ede5cf4489499abbdc29fc (diff)
downloadsamba-453a822a76780063dff23526c35408866d0c0154.tar.gz
samba-453a822a76780063dff23526c35408866d0c0154.tar.xz
samba-453a822a76780063dff23526c35408866d0c0154.zip
first pass at updating head branch to be to be the same as the SAMBA_2_0 branch
Diffstat (limited to 'source/mem_man/mem_man.h')
-rw-r--r--source/mem_man/mem_man.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/mem_man/mem_man.h b/source/mem_man/mem_man.h
index eef281b2f91..60e31e6d442 100644
--- a/source/mem_man/mem_man.h
+++ b/source/mem_man/mem_man.h
@@ -1,4 +1,4 @@
-#if (defined(NOMEMMAN) && !defined(MEM_MAN_MAIN) && defined(HAVE_MALLOC_H))
+#if (defined(NOMEMMAN) && !defined(MEM_MAN_MAIN))
#include <malloc.h>
#else