diff options
| author | Carlos Eduardo Medaglia Dyonisio <medaglia@undl.org.br> | 2004-10-18 18:15:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 18:15:39 -0700 |
| commit | 8d8b5f34361b3cc7181df73e5aef89646fa68ddb (patch) | |
| tree | f4b6cb3a2a0d5cf3e9f25fa59aff227454877cab /include | |
| parent | 48e5872368b1ada27804e5c4c15fbeea9eb3c284 (diff) | |
[PATCH] Fix types.h
This patch fixes troubles when compiling some applications that include
<linux/byteorder/little_endian.h>, like xmms.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/types.h | 14 |
1 files changed, 7 insertions, 7 deletions
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; |