include/linux/types.h: use fixed width types without double-underscore prefix

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

diff --git a/include/linux/types.h b/include/linux/types.h
index be1589763e0a2546200a2a84b0608fc211b7acc7..9834e90aa01007b65aba351c76a5e47627c3e286 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -10,14 +10,14 @@
 #define DECLARE_BITMAP(name,bits) \
        unsigned long name[BITS_TO_LONGS(bits)]
 
-typedef __u32 __kernel_dev_t;
+typedef u32 __kernel_dev_t;
 
 typedef __kernel_fd_set                fd_set;
 typedef __kernel_dev_t         dev_t;
 typedef __kernel_ino_t         ino_t;
 typedef __kernel_mode_t                mode_t;
 typedef unsigned short         umode_t;
-typedef __u32                  nlink_t;
+typedef u32                    nlink_t;
 typedef __kernel_off_t         off_t;
 typedef __kernel_pid_t         pid_t;
 typedef __kernel_daddr_t       daddr_t;
@@ -95,23 +95,23 @@ typedef unsigned long               ulong;
 #ifndef __BIT_TYPES_DEFINED__
 #define __BIT_TYPES_DEFINED__
 
-typedef                __u8            u_int8_t;
-typedef                __s8            int8_t;
-typedef                __u16           u_int16_t;
-typedef                __s16           int16_t;
-typedef                __u32           u_int32_t;
-typedef                __s32           int32_t;
+typedef u8                     u_int8_t;
+typedef s8                     int8_t;
+typedef u16                    u_int16_t;
+typedef s16                    int16_t;
+typedef u32                    u_int32_t;
+typedef s32                    int32_t;
 
 #endif /* !(__BIT_TYPES_DEFINED__) */
 
-typedef                __u8            uint8_t;
-typedef                __u16           uint16_t;
-typedef                __u32           uint32_t;
+typedef u8                     uint8_t;
+typedef u16                    uint16_t;
+typedef u32                    uint32_t;
 
 #if defined(__GNUC__)
-typedef                __u64           uint64_t;
-typedef                __u64           u_int64_t;
-typedef                __s64           int64_t;
+typedef u64                    uint64_t;
+typedef u64                    u_int64_t;
+typedef s64                    int64_t;
 #endif
 
 /* this is a special 64bit data type that is 8-byte aligned */