From: Nathan Scott <nathans@sgi.com>
Date: Fri, 11 Nov 2005 14:25:59 +0000 (+0000)
Subject: Allow swab.h to be used in -pedantic c++ build environments.
X-Git-Tag: v2.8.0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8db74e32979b43a2dd4208afa8b8206ea5a903ba;p=thirdparty%2Fxfsprogs-dev.git

Allow swab.h to be used in -pedantic c++ build environments.
Merge of master-melb:xfs-cmds:24373a by kenmcd.
---

diff --git a/include/swab.h b/include/swab.h
index bd926a787..2684aa70e 100644
--- a/include/swab.h
+++ b/include/swab.h
@@ -110,28 +110,28 @@
 
 static __inline__ __u16 __fswab16(__u16 x)
 {
-	return __arch__swab16(x);
+	return (__extension__ __arch__swab16(x));
 }
 static __inline__ __u16 __swab16p(__u16 *x)
 {
-	return __arch__swab16p(x);
+	return (__extension__ __arch__swab16p(x));
 }
 static __inline__ void __swab16s(__u16 *addr)
 {
-	__arch__swab16s(addr);
+	(__extension__ ({__arch__swab16s(addr);}));
 }
 
 static __inline__ __u32 __fswab32(__u32 x)
 {
-	return __arch__swab32(x);
+	return (__extension__ __arch__swab32(x));
 }
 static __inline__ __u32 __swab32p(__u32 *x)
 {
-	return __arch__swab32p(x);
+	return (__extension__ __arch__swab32p(x));
 }
 static __inline__ void __swab32s(__u32 *addr)
 {
-	__arch__swab32s(addr);
+	(__extension__ ({__arch__swab32s(addr);}));
 }
 
 static __inline__ __u64 __fswab64(__u64 x)
@@ -141,16 +141,16 @@ static __inline__ __u64 __fswab64(__u64 x)
 	__u32 l = x & ((1ULL<<32)-1);
 	return (((__u64)__swab32(l)) << 32) | ((__u64)(__swab32(h)));
 #  else
-	return __arch__swab64(x);
+	return (__extension__ __arch__swab64(x));
 #  endif
 }
 static __inline__ __u64 __swab64p(__u64 *x)
 {
-	return __arch__swab64p(x);
+	return (__extension__ __arch__swab64p(x));
 }
 static __inline__ void __swab64s(__u64 *addr)
 {
-	__arch__swab64s(addr);
+	(__extension__ ({__arch__swab64s(addr);}));
 }
 
 #endif /* SWAB_H */