summaryrefslogtreecommitdiff
path: root/source3/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
commit3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 (patch)
tree866dd15416c3d8554bb207709f433a87ad0c012d /source3/mem_man/mem_man.h
parentf6276724bafdb6145c0c7b565172d80cb04516ea (diff)
downloadsamba-3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7.tar.gz
samba-3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7.tar.bz2
samba-3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7.zip
first pass at updating head branch to be to be the same as the SAMBA_2_0 branch
(This used to be commit 453a822a76780063dff23526c35408866d0c0154)
Diffstat (limited to 'source3/mem_man/mem_man.h')
-rw-r--r--source3/mem_man/mem_man.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/mem_man/mem_man.h b/source3/mem_man/mem_man.h
index eef281b2f9..60e31e6d44 100644
--- a/source3/mem_man/mem_man.h
+++ b/source3/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