lib/{ext2fs,support}: fix 32-bit Windows build

[tools/e2fsprogs.git] / lib / ext2fs / compiler.h

diff --git a/lib/ext2fs/compiler.h b/lib/ext2fs/compiler.h
index 42faa61..3bb3521 100644 (file)
--- a/lib/ext2fs/compiler.h
+++ b/lib/ext2fs/compiler.h
@@ -4,8 +4,18 @@
 #include <stddef.h>
 
 #ifdef __GNUC__
-#define container_of(ptr, type, member) ({                     \
-       const __typeof__( ((type *)0)->member ) *__mptr = (ptr);        \
+
+#ifndef __GNUC_PREREQ
+#if defined(__GNUC__) && defined(__GNUC_MINOR__)
+#define __GNUC_PREREQ(maj, min) \
+       ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+#define __GNUC_PREREQ(maj, min) 0
+#endif
+#endif
+
+#define container_of(ptr, type, member) ({                             \
+       __typeof__( ((type *)0)->member ) *__mptr = (ptr);      \
        (type *)( (char *)__mptr - offsetof(type,member) );})
 #else
 #define container_of(ptr, type, member)                                \