summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/i386
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-08-26 17:13:30 +0000
committerEric Andersen <andersen@codepoet.org>2002-08-26 17:13:30 +0000
commit32644f78992f912196bf0a8a308b1dd8f8847dfe (patch)
tree1bd3eda011db901eb4a7620c22c0b75a7e9fd115 /libc/sysdeps/linux/i386
parent920359d7d2fb76694e4163df9968667d7c83d7f2 (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/i386')
-rw-r--r--libc/sysdeps/linux/i386/bits/kernel_types.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
index 1ed6176cb..0f3bca51e 100644
--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
+++ b/libc/sysdeps/linux/i386/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_I386_POSIX_TYPES_H
+#define __ARCH_I386_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_I386_POSIX_TYPES_H */