diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-08-26 17:13:30 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-08-26 17:13:30 +0000 |
| commit | 32644f78992f912196bf0a8a308b1dd8f8847dfe (patch) | |
| tree | 1bd3eda011db901eb4a7620c22c0b75a7e9fd115 /libc/sysdeps/linux/sparc | |
| parent | 920359d7d2fb76694e4163df9968667d7c83d7f2 (diff) | |
Make bits/kernel_types.h include guard names match the include
guard names used by the kernel's asm/posix_types.h to eliminate
gratuitous conflicts and let our file win over the very-likely-
to-be-broken kernel header file.
-Erik
Diffstat (limited to 'libc/sysdeps/linux/sparc')
| -rw-r--r-- | libc/sysdeps/linux/sparc/bits/kernel_types.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h index 3171d622f..bb53bf600 100644 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h @@ -1,5 +1,12 @@ -#ifndef _BITS_KERNEL_TYPES_H -#define _BITS_KERNEL_TYPES_H +/* Note that we use the exact same include guard #define names + * as asm/posix_types.h. This will avoid gratuitous conflicts + * with the posix_types.h kernel header, and will ensure that + * our private content, and not the kernel header, will win. + * -Erik + */ +#if ! defined __ARCH_SPARC_POSIX_TYPES_H && ! defined __ARCH_SPARC64_POSIX_TYPES_H +#define __ARCH_SPARC_POSIX_TYPES_H +#define __ARCH_SPARC64_POSIX_TYPES_H # if __WORDSIZE == 64 typedef unsigned long __kernel_size_t; @@ -55,4 +62,5 @@ typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; #endif -#endif /* _BITS_KERNEL_TYPES_H */ +#endif /* ! defined __ARCH_SPARC_POSIX_TYPES_H && ! defined __ARCH_SPARC64_POSIX_TYPES_H */ + |