From: Christoph Hellwig <hch@lst.de>
Date: Thu, 2 Jul 2015 04:36:57 +0000 (+1000)
Subject: xfsprogs: remove the uint_t typedef
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd267f4aa6b919ad081057b9b6214174bec3c00e;p=thirdparty%2Fxfsprogs-dev.git

xfsprogs: remove the uint_t typedef

This was only used in a few IRIX platform helpers that can use __uint32_t
instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/include/irix.h b/include/irix.h
index 504045189..ad6dbfed7 100644
--- a/include/irix.h
+++ b/include/irix.h
@@ -294,13 +294,13 @@ static __inline__ void platform_getoptreset(void)
 
 static __inline__ int platform_uuid_compare(uuid_t *uu1, uuid_t *uu2)
 {
-	uint_t status;
+	__uint32_t status;
 	return uuid_compare(uu1, uu2, &status);
 }
 
 static __inline__ void platform_uuid_unparse(uuid_t *uu, char *buffer)
 {
-	uint_t status;
+	__uint32_t status;
 	char *s;
 	uuid_to_string(uu, &s, &status);
 	if (status == uuid_s_ok)
@@ -311,7 +311,7 @@ static __inline__ void platform_uuid_unparse(uuid_t *uu, char *buffer)
 
 static __inline__ int platform_uuid_parse(char *buffer, uuid_t *uu)
 {
-	uint_t status;
+	__uint32_t status;
 	uuid_from_string(buffer, uu, &status);
 	return (status == uuid_s_ok);
 }
@@ -324,13 +324,13 @@ static __inline__ int platform_uuid_is_null(uuid_t *uu)
 
 static __inline__ void platform_uuid_generate(uuid_t *uu)
 {
-	uint_t status;
+	__uint32_t status;
 	uuid_create(uu, &status);
 }
 
 static __inline__ void platform_uuid_clear(uuid_t *uu)
 {
-	uint_t status;
+	__uint32_t status;
 	uuid_create_nil(uu, &status);
 }
 
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 32ba89f8a..1cf568d8c 100644
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -95,8 +95,6 @@ extern char    *progname;
 #undef ASSERT
 #define ASSERT(ex) assert(ex)
 
-typedef __uint32_t		uint_t;
-
 #ifndef EWRONGFS
 #define EWRONGFS	EINVAL
 #endif