From: paul <paul>
Date: Fri, 22 Apr 2005 13:44:17 +0000 (+0000)
Subject: 2005-04-22 Paul Jakma <paul.jakma@sun.com>
X-Git-Tag: frr-2.0-rc1~3053
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e1e53ed5d7aaa70e23abac6f7d21ef1646bad123;p=matthieu%2Ffrr.git

2005-04-22 Paul Jakma <paul.jakma@sun.com>

	* memory.h: Move include of memtypes.h to after the definition of
	  struct memory_list, gcc 4.0 doesn't like arrays of incomplete
	  types.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 3bd151bfba..bef71f4d3d 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-22 Paul Jakma <paul.jakma@sun.com>
 
+	* memory.h: Move include of memtypes.h to after the definition of
+	  struct memory_list, gcc 4.0 doesn't like arrays of incomplete 
+	  types.
 	* thread.h: Add background thread type and thread_add_background
 	  macro and accompanying funcname_... function.
 	  export thread_should_yield, background threads can use it.
diff --git a/lib/memory.h b/lib/memory.h
index 7b4719789d..ce379e45bc 100644
--- a/lib/memory.h
+++ b/lib/memory.h
@@ -21,8 +21,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #ifndef _ZEBRA_MEMORY_H
 #define _ZEBRA_MEMORY_H
 
-#include "memtypes.h"
-
 /* For pretty printing of memory allocate information. */
 struct memory_list
 {
@@ -35,6 +33,8 @@ struct mlist {
   const char *name;
 };
  
+#include "memtypes.h"
+
 extern struct mlist mlists[];
 
 /* #define MEMORY_LOG */