summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ChangeLog3
-rw-r--r--lib/memory.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 3bd151bf..bef71f4d 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 7b471978..ce379e45 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 */