On 05-Mar-31 09:39, Nathan Scott wrote:
> On Wed, Mar 30, 2005 at 08:16:29AM +0200, Andreas Jochens wrote:
> > 
> > I still get the attached error message even with all your patches 
> > applied.
> > 
> > Sorry for my delayed answer and thank you for your help.
> 
> No problem.  This patch should resolve those errors, any further
> problems with this applied?

There were three more problems in check.c, command.c and type.c.

When those are fixed, the compilation succeeds. The attached
patch against the current 'unstable' version of xfsprogs
includes your patches and similar fixes for check.c, 
command.c and type.c.

Regards
Andreas Jochens

diff -urN ../tmp-orig/xfsprogs-2.6.26/db/agf.c ./db/agf.c
--- ../tmp-orig/xfsprogs-2.6.26/db/agf.c        2003-05-01 08:00:49.000000000 
+0200
+++ ./db/agf.c  2005-03-30 08:11:34.000000000 +0200
@@ -31,7 +31,6 @@
  */
 
 #include <xfs/libxfs.h>
-#include "agf.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"
@@ -41,6 +40,7 @@
 #include "bit.h"
 #include "output.h"
 #include "init.h"
+#include "agf.h"
 
 static int agf_f(int argc, char **argv);
 static void agf_help(void);
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/agf.h ./db/agf.h
--- ../tmp-orig/xfsprogs-2.6.26/db/agf.h        2003-04-29 08:08:41.000000000 
+0200
+++ ./db/agf.h  2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      agf_flds[];
 extern const struct field      agf_hfld[];
 
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/agfl.c ./db/agfl.c
--- ../tmp-orig/xfsprogs-2.6.26/db/agfl.c       2003-05-01 08:00:49.000000000 
+0200
+++ ./db/agfl.c 2005-03-30 08:11:34.000000000 +0200
@@ -31,7 +31,6 @@
  */
 
 #include <xfs/libxfs.h>
-#include "agfl.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"
@@ -41,6 +40,7 @@
 #include "bit.h"
 #include "output.h"
 #include "init.h"
+#include "agfl.h"
 
 static int agfl_bno_size(void *obj, int startoff);
 static int agfl_f(int argc, char **argv);
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/agfl.h ./db/agfl.h
--- ../tmp-orig/xfsprogs-2.6.26/db/agfl.h       2003-04-29 08:08:41.000000000 
+0200
+++ ./db/agfl.h 2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      agfl_flds[];
 extern const struct field      agfl_hfld[];
 
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/agi.c ./db/agi.c
--- ../tmp-orig/xfsprogs-2.6.26/db/agi.c        2003-05-01 08:00:49.000000000 
+0200
+++ ./db/agi.c  2005-03-30 08:11:35.000000000 +0200
@@ -31,7 +31,6 @@
  */
 
 #include <xfs/libxfs.h>
-#include "agi.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"
@@ -41,6 +40,7 @@
 #include "bit.h"
 #include "output.h"
 #include "init.h"
+#include "agi.h"
 
 static int agi_f(int argc, char **argv);
 static void agi_help(void);
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/agi.h ./db/agi.h
--- ../tmp-orig/xfsprogs-2.6.26/db/agi.h        2003-04-29 08:08:41.000000000 
+0200
+++ ./db/agi.h  2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      agi_flds[];
 extern const struct field      agi_hfld[];
 
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/bmap.c ./db/bmap.c
--- ../tmp-orig/xfsprogs-2.6.26/db/bmap.c       2003-05-01 08:00:49.000000000 
+0200
+++ ./db/bmap.c 2005-03-31 09:33:00.113033944 +0200
@@ -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 -urN ../tmp-orig/xfsprogs-2.6.26/db/bmapbt.h ./db/bmapbt.h
--- ../tmp-orig/xfsprogs-2.6.26/db/bmapbt.h     2003-04-29 08:08:41.000000000 
+0200
+++ ./db/bmapbt.h       2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      bmapbta_flds[];
 extern const struct field      bmapbta_hfld[];
 extern const struct field      bmapbta_key_flds[];
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/bmroot.h ./db/bmroot.h
--- ../tmp-orig/xfsprogs-2.6.26/db/bmroot.h     2003-04-29 08:08:42.000000000 
+0200
+++ ./db/bmroot.h       2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      bmroota_flds[];
 extern const struct field      bmroota_key_flds[];
 extern const struct field      bmrootd_flds[];
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/bnobt.h ./db/bnobt.h
--- ../tmp-orig/xfsprogs-2.6.26/db/bnobt.h      2003-04-29 08:08:42.000000000 
+0200
+++ ./db/bnobt.h        2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      bnobt_flds[];
 extern const struct field      bnobt_hfld[];
 extern const struct field      bnobt_key_flds[];
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/check.c ./db/check.c
--- ../tmp-orig/xfsprogs-2.6.26/db/check.c      2004-07-05 08:00:50.000000000 
+0200
+++ ./db/check.c        2005-03-31 09:36:32.335243370 +0200
@@ -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 -urN ../tmp-orig/xfsprogs-2.6.26/db/cntbt.h ./db/cntbt.h
--- ../tmp-orig/xfsprogs-2.6.26/db/cntbt.h      2003-04-29 08:08:42.000000000 
+0200
+++ ./db/cntbt.h        2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      cntbt_flds[];
 extern const struct field      cntbt_hfld[];
 extern const struct field      cntbt_key_flds[];
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/command.c ./db/command.c
--- ../tmp-orig/xfsprogs-2.6.26/db/command.c    2004-06-18 10:08:40.000000000 
+0200
+++ ./db/command.c      2005-03-31 09:37:31.734106388 +0200
@@ -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 -urN ../tmp-orig/xfsprogs-2.6.26/db/dquot.c ./db/dquot.c
--- ../tmp-orig/xfsprogs-2.6.26/db/dquot.c      2003-05-01 08:00:50.000000000 
+0200
+++ ./db/dquot.c        2005-03-30 08:11:37.000000000 +0200
@@ -34,7 +34,6 @@
 #include "bit.h"
 #include "bmap.h"
 #include "command.h"
-#include "dquot.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"
@@ -43,6 +42,7 @@
 #include "io.h"
 #include "init.h"
 #include "output.h"
+#include "dquot.h"
 
 static int     dquot_f(int argc, char **argv);
 static void    dquot_help(void);
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/dquot.h ./db/dquot.h
--- ../tmp-orig/xfsprogs-2.6.26/db/dquot.h      2003-04-29 08:08:43.000000000 
+0200
+++ ./db/dquot.h        2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      disk_dquot_flds[];
 extern const struct field      dqblk_flds[];
 extern const struct field      dqblk_hfld[];
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/faddr.c ./db/faddr.c
--- ../tmp-orig/xfsprogs-2.6.26/db/faddr.c      2004-04-02 06:08:19.000000000 
+0200
+++ ./db/faddr.c        2005-03-31 09:33:00.120032632 +0200
@@ -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 -urN ../tmp-orig/xfsprogs-2.6.26/db/inobt.h ./db/inobt.h
--- ../tmp-orig/xfsprogs-2.6.26/db/inobt.h      2003-04-29 08:08:45.000000000 
+0200
+++ ./db/inobt.h        2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      inobt_flds[];
 extern const struct field      inobt_hfld[];
 extern const struct field      inobt_key_flds[];
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/sb.h ./db/sb.h
--- ../tmp-orig/xfsprogs-2.6.26/db/sb.h 2004-06-18 10:08:40.000000000 +0200
+++ ./db/sb.h   2005-03-30 08:11:34.000000000 +0200
@@ -30,8 +30,6 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-struct field;
-
 extern const struct field      sb_flds[];
 extern const struct field      sb_hfld[];
 
diff -urN ../tmp-orig/xfsprogs-2.6.26/db/type.c ./db/type.c
--- ../tmp-orig/xfsprogs-2.6.26/db/type.c       2003-05-01 08:00:51.000000000 
+0200
+++ ./db/type.c 2005-03-31 09:38:01.993432919 +0200
@@ -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"



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to