summaryrefslogtreecommitdiff
path: root/lib/memory.c
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2006-05-28 08:15:46 +0000
committerPaul Jakma <paul.jakma@sun.com>2006-05-28 08:15:46 +0000
commitd09552d0c7d389f83c3833bf82f7a97da37007da (patch)
tree0e6d58e813515d408b5f04099f0b5f7e12e2aedd /lib/memory.c
parent35cfc90cce32b19c71d2f40aab06d36eb6bfdc44 (diff)
[lib] malloc.h is deprecated, try not to include it anymore
2006-05-28 Paul Jakma <paul.jakma@sun.com> * memory.c: malloc.h is deprecated in favour of stdlib.h, however we still need it on GNU Libc for mallinfo().
Diffstat (limited to 'lib/memory.c')
-rw-r--r--lib/memory.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/memory.c b/lib/memory.c
index 802c07f2..1141e405 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -21,7 +21,10 @@
*/
#include <zebra.h>
+/* malloc.h is generally obsolete, however GNU Libc mallinfo wants it. */
+#if defined(HAVE_STDLIB_H) || (defined(GNU_LINUX) && defined(HAVE_MALLINFO))
#include <malloc.h>
+#endif /* !HAVE_STDLIB_H || HAVE_MALLINFO */
#include "log.h"
#include "memory.h"