From: Steve Lord <lord@sgi.com>
Date: Thu, 12 Jul 2001 17:31:50 +0000 (+0000)
Subject: Bump minor version - revised xfs_types.h file
X-Git-Tag: v2.0.0~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd0e776cc1959d9f1cf9a7e16481e3aca07f5add;p=thirdparty%2Fxfsprogs-dev.git

Bump minor version - revised xfs_types.h file
---

diff --git a/VERSION b/VERSION
index edf33a81f..caad6d580 100644
--- 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 2d54d627c..ef4cd1a33 100644
--- 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 b7aafb4ff..1b98f4298 100644
--- 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;