vserver 1.9.5.x5

[linux-2.6.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index e678ccb..bc227cc 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -142,6 +142,13 @@ typedef unsigned long sector_t;
 #define pgoff_t unsigned long
 #endif
 
+#endif /* __KERNEL_STRICT_NAMES */
+
+/*
+ * Below are truly Linux-specific types that should never collide with
+ * any application/library that wants linux/types.h.
+ */
+
 #ifdef __CHECKER__
 #define __bitwise __attribute__((bitwise))
 #else
@@ -152,15 +159,10 @@ typedef __u16 __bitwise __le16;
 typedef __u16 __bitwise __be16;
 typedef __u32 __bitwise __le32;
 typedef __u32 __bitwise __be32;
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 typedef __u64 __bitwise __le64;
 typedef __u64 __bitwise __be64;
-
-#endif /* __KERNEL_STRICT_NAMES */
-
-/*
- * Below are truly Linux-specific types that should never collide with
- * any application/library that wants linux/types.h.
- */
+#endif
 
 struct ustat {
        __kernel_daddr_t        f_tfree;