From: Paul Jakma <paul.jakma@sun.com>
Date: Fri, 30 Jun 2006 16:49:02 +0000 (+0000)
Subject: [lib] Fix typo in cpp conditional for malloc.h include
X-Git-Tag: frr-2.0-rc1~2655
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=74176d220ba6fb019a18ebea3e3245a46f33dce1;p=mirror%2Ffrr.git

[lib] Fix typo in cpp conditional for malloc.h include

2006-06-28 Paul Jakma <paul.jakma@sun.com>

	* memory.c: Fix typo in cpp conditional around malloc.h, from
	  comment in bug #269.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 89f017a1c8..5f215d625b 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 1141e40570..eb670722b1 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 */