summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ChangeLog5
-rw-r--r--lib/memory.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 89f017a1..5f215d62 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-28 Paul Jakma <paul.jakma@sun.com>
+
+ * memory.c: Fix typo in cpp conditional around malloc.h, from
+ comment in bug #269.
+
2006-06-27 Paul Jakma <paul.jakma@sun.com>
* route_types.awk: Remove setting the 'bare' numeric route type
diff --git a/lib/memory.c b/lib/memory.c
index 1141e405..eb670722 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -22,7 +22,7 @@
#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))
+#if !defined(HAVE_STDLIB_H) || (defined(GNU_LINUX) && defined(HAVE_MALLINFO))
#include <malloc.h>
#endif /* !HAVE_STDLIB_H || HAVE_MALLINFO */