Bump minor version - revised xfs_types.h file

diff --git a/VERSION b/VERSION
index edf33a81f9c7fb5b0fd60c0325fb00fcbc80f729..caad6d580360a3449bfa061b0ed37a34baffc908 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=1
 PKG_MINOR=3
-PKG_REVISION=0
+PKG_REVISION=1
 PKG_BUILD=pre1

diff --git a/doc/CHANGES b/doc/CHANGES
index 2d54d627ca878a1c90247283d1cfcb4378ad3ef5..ef4cd1a33f110dbe9c38ea1650d1fc3ddfd60943 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,8 @@
-xfsprogs-1.3.0 (19 Jul 2001)
+xfsprogs-1.3.1 (12 Jul 2001)
+       - updated xfs_types.h file from the kernel changes needed for
+         an xfsdump fix.
+
+xfsprogs-1.3.0 (11 Jul 2001)
        - reworked Makefiles to use libtool
        - new libdisk to allow sharing of generic mount/disk code and
        - also abstracts individual driver support (LVM, MD, XVM..)

diff --git a/include/xfs_types.h b/include/xfs_types.h
index b7aafb4ff05e5a6cfc177033c500a0669bec8ee7..1b98f429800955b6fcfab6235821fe30d75d3db8 100644 (file)
--- a/include/xfs_types.h
+++ b/include/xfs_types.h
@@ -254,10 +254,13 @@ struct xfsstats {
 #endif /* !CONFIG_PROC_FS */
 
 
-#ifdef __KERNEL__
 
 /* juggle IRIX device numbers - still used in ondisk structures */
 
+#ifndef __KERNEL__
+#define MKDEV(major, minor)    makedev(major, minor)
+#endif
+
 #define IRIX_DEV_BITSMAJOR      14
 #define IRIX_DEV_BITSMINOR      18 
 #define IRIX_DEV_MAXMAJ         0x1ff 
@@ -271,6 +274,7 @@ struct xfsstats {
 #define IRIX_DEV_TO_KDEVT(dev)  MKDEV(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev))
 #define IRIX_DEV_TO_DEVT(dev)   ((IRIX_DEV_MAJOR(dev)<<8)|IRIX_DEV_MINOR(dev))
 
+#ifdef __KERNEL__
 /* __psint_t is the same size as a pointer */
 #if (BITS_PER_LONG == 32)
 typedef __int32_t __psint_t;