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 b9a3e38e2db4d9916a6c8efdc59770052aef4a9b..042824c78a8e9f61a17098d67ac26d69bf19ad45 100644 (file)
--- 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 efb8592798154ca0cd6d18ebbb5087327981dcab..f647047538c057e2eaf4e634182afdbe06961fa0 100644 (file)
--- 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 a1f02ceb8127bfa6a8448f536b7caac264c2b8c4..b2c9f769a3c8b598e4cc727d7bf4fa4dcf53cebf 100644 (file)
--- 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 1a1d900176532291544bcd5348c383c5d299a83d..c7912045cc5a41563f9a60bd33a0016acf84fe18 100644 (file)
--- 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 5b30fb30bdddcb319eb0bf088b16e8fb097694c0..40d0e6f1d355b8030ab5d01063263a255a66f7ed 100644 (file)
--- 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"