Reintroduce f_type comparison macro

[elogind.git] / src / shared / macro.h

diff --git a/src/shared/macro.h b/src/shared/macro.h
index 08b40fd2b8af0e85260ba6a058095c0dd0fb5fd5..ac61b495883dc754f124010428e2b5e36302db78 100644 (file)
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -264,21 +264,11 @@ do {                                                                    \
         }                                                               \
 } while(false)
 
-/* Remove this macro, when the kernel has f_type as unsigned int or long
- * for every architecure. Currently some 64bit architecures (like s390x)
- * have int in the kernel, but long in userspace for f_type, so glibc
- * extends the int to long and carries over the sign. Negative numbers are
- * caused by the 32bit magic constants in linux/magic.h stuffed into the
- * signed int in the kernel and these negative numbers are extended to
- * long, which cannot be simply compared to the magic constants anymore.
+ /* Because statfs.t_type can be int on some architecures, we have to cast
+  * the const magic to the type, otherwise the compiler warns about
+  * signed/unsigned comparison, because the magic can be 32 bit unsigned.
  */
-#define F_TYPE_CMP(f, c)                                                \
-        __extension__ ({                                                \
-                        __SWORD_TYPE _f = (f);                          \
-                        const __SWORD_TYPE _c = (c);                    \
-                        const int _c32 = (c);                           \
-                        (_f == _c || _f == _c32 );                      \
-                })
+#define F_TYPE_CMP(a, b) (a == (typeof(a)) b)
 
 
 /* Returns the number of chars needed to format variables of the