From 32644f78992f912196bf0a8a308b1dd8f8847dfe Mon Sep 17 00:00:00 2001 From: Eric Andersen 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/m68k/bits/kernel_types.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'libc/sysdeps/linux/m68k') diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h index 1ed6176cb..5b020b342 100644 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h @@ -1,5 +1,11 @@ -#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 + */ +#ifndef __ARCH_M68K_POSIX_TYPES_H +#define __ARCH_M68K_POSIX_TYPES_H typedef unsigned short __kernel_dev_t; typedef unsigned long __kernel_ino_t; @@ -26,4 +32,4 @@ typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; -#endif /* _BITS_KERNEL_TYPES_H */ +#endif /* __ARCH_M68K_POSIX_TYPES_H */ -- cgit v1.2.3