From: Nathan Scott <nathans@sgi.com>
Date: Wed, 7 Jun 2006 04:28:06 +0000 (+0000)
Subject: Back out removal of HAVE_SWABMACROS for now - IRIX builds still need it atm.
X-Git-Tag: v2.9.0~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8dcbc87628b6b3ac592c3281ab33c867cc6eadf;p=thirdparty%2Fxfsprogs-dev.git

Back out removal of HAVE_SWABMACROS for now - IRIX builds still need it atm.
Merge of master-melb:xfs-cmds:26188a by kenmcd.
---

diff --git a/include/irix.h b/include/irix.h
index 882f241a8..852b484fc 100644
--- a/include/irix.h
+++ b/include/irix.h
@@ -128,6 +128,10 @@ typedef struct xfs_fsop_attrmulti_handlereq {
 
 /* Map some gcc macros for the MipsPRO compiler */
 #ifndef __GNUC__
+#define INT_SWAP16(type,var)	(var)
+#define INT_SWAP32(type,var)	(var)
+#define INT_SWAP64(type,var)	(var)
+#define HAVE_SWABMACROS		1 /* no typeof available */
 #define __builtin_constant_p(x)	(0)
 #define __FUNCTION__	"XFS"
 #define __sgi__		__sgi
diff --git a/include/xfs_arch.h b/include/xfs_arch.h
index b16825b91..7be1fb68f 100644
--- a/include/xfs_arch.h
+++ b/include/xfs_arch.h
@@ -68,9 +68,11 @@
 
 /* generic swapping macros */
 
+#ifndef HAVE_SWABMACROS
 #define INT_SWAP16(type,var) ((typeof(type))(__swab16((__u16)(var))))
 #define INT_SWAP32(type,var) ((typeof(type))(__swab32((__u32)(var))))
 #define INT_SWAP64(type,var) ((typeof(type))(__swab64((__u64)(var))))
+#endif
 
 #define INT_SWAP(type, var) \
     ((sizeof(type) == 8) ? INT_SWAP64(type,var) : \