From: Nathan Scott <nathans@sgi.com>
Date: Thu, 31 Mar 2005 14:59:00 +0000 (+0000)
Subject: Yet more fixes to get xfs_db to compile with gcc4.
X-Git-Tag: v2.7.0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=128efca18aab157d7049766ef2a3989a7a65d660;p=thirdparty%2Fxfsprogs-dev.git

Yet more fixes to get xfs_db to compile with gcc4.
Merge of master-melb:xfs-cmds:22023a by kenmcd.
---

diff --git a/db/bmap.c b/db/bmap.c
index b9a3e38e2..042824c78 100644
--- a/db/bmap.c
+++ b/db/bmap.c
@@ -33,6 +33,9 @@
 #include <xfs/libxfs.h>
 #include "command.h"
 #include "type.h"
+#include "fprint.h"
+#include "faddr.h"
+#include "field.h"
 #include "bmap.h"
 #include "io.h"
 #include "inode.h"
diff --git a/db/check.c b/db/check.c
index efb859279..f64704753 100644
--- a/db/check.c
+++ b/db/check.c
@@ -37,9 +37,12 @@
 #include "check.h"
 #include "command.h"
 #include "io.h"
+#include "type.h"
+#include "fprint.h"    
+#include "faddr.h"     
+#include "field.h"     
 #include "sb.h"
 #include "output.h"
-#include "type.h"
 #include "init.h"
 #include "malloc.h"
 
diff --git a/db/command.c b/db/command.c
index a1f02ceb8..b2c9f769a 100644
--- a/db/command.c
+++ b/db/command.c
@@ -32,9 +32,6 @@
 
 #include <xfs/libxfs.h>
 #include "addr.h"
-#include "agf.h"
-#include "agfl.h"
-#include "agi.h"
 #include "block.h"
 #include "bmap.h"
 #include "check.h"
@@ -46,6 +43,9 @@
 #include "faddr.h"
 #include "fprint.h"
 #include "field.h"
+#include "agf.h"
+#include "agfl.h"
+#include "agi.h"
 #include "frag.h"
 #include "freesp.h"
 #include "help.h"
diff --git a/db/faddr.c b/db/faddr.c
index 1a1d90017..c7912045c 100644
--- a/db/faddr.c
+++ b/db/faddr.c
@@ -32,7 +32,9 @@
 
 #include <xfs/libxfs.h>
 #include "type.h"
+#include "fprint.h"
 #include "faddr.h"
+#include "field.h"
 #include "inode.h"
 #include "io.h"
 #include "bit.h"
diff --git a/db/type.c b/db/type.c
index 5b30fb30b..40d0e6f1d 100644
--- a/db/type.c
+++ b/db/type.c
@@ -31,9 +31,6 @@
  */
 
 #include <xfs/libxfs.h>
-#include "agf.h"
-#include "agfl.h"
-#include "agi.h"
 #include "block.h"
 #include "command.h"
 #include "type.h"