From 8d8b5f34361b3cc7181df73e5aef89646fa68ddb Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Medaglia Dyonisio Date: Mon, 18 Oct 2004 18:15:39 -0700 Subject: [PATCH] Fix types.h This patch fixes troubles when compiling some applications that include , like xmms. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/linux/types.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'include/linux') diff --git a/include/linux/types.h b/include/linux/types.h index 13ccdf3036fd..893c4b367bae 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -140,6 +140,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 @@ -153,13 +160,6 @@ typedef __u32 __bitwise __be32; 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. - */ - struct ustat { __kernel_daddr_t f_tfree; __kernel_ino_t f_tinode; -- cgit v1.2.3