From d09552d0c7d389f83c3833bf82f7a97da37007da Mon Sep 17 00:00:00 2001
From: Paul Jakma <paul.jakma@sun.com>
Date: Sun, 28 May 2006 08:15:46 +0000
Subject: [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().
---
 lib/memory.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/memory.c')

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"
-- 
cgit v1.2.1