From 32644f78992f912196bf0a8a308b1dd8f8847dfe Mon Sep 17 00:00:00 2001 From: Eric Andersen <andersen@codepoet.org> Date: Mon, 26 Aug 2002 17:13:30 +0000 Subject: 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 --- libc/sysdeps/linux/powerpc/bits/kernel_types.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'libc/sysdeps/linux/powerpc') diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h index e8e1fe160..a679ca34f 100644 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h +++ b/libc/sysdeps/linux/powerpc/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 _PPC_POSIX_TYPES_H && ! defined _PPC64_POSIX_TYPES_H +#define _PPC_POSIX_TYPES_H +#define _PPC64_POSIX_TYPES_H # if __WORDSIZE == 64 typedef unsigned int __kernel_dev_t; @@ -53,4 +60,5 @@ typedef unsigned int __kernel_old_gid_t; typedef long long __kernel_loff_t; #endif -#endif /* _BITS_KERNEL_TYPES_H */ +#endif /* ! defined _PPC_POSIX_TYPES_H && ! defined _PPC64_POSIX_TYPES_H */ + -- cgit v1.2.3