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 3bd151bfbaaa80c70accafcee969cb77290bd308..bef71f4d3dbe0ba7db61b7d6d37751861dbff2f9 100644 (file)
--- 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 7b4719789dc7febd27404aa58507fb4c34c18448..ce379e45bc418bd993107f0a2e24866ae4a4306e 100644 (file)
--- 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 */