From 56e1ba1b2337f6182927c4a975741111108f3353 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 12 Jan 2009 15:07:42 +0000 Subject: - fixup incomplete r24515 (fix redefinitions of posix_types for i386->x86_64 with linux >= 2.6.28) --- libc/sysdeps/linux/i386/bits/kernel_types.h | 1 + libc/sysdeps/linux/x86_64/bits/kernel_types.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'libc/sysdeps') diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h index 8641a48c0..543f75f5c 100644 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h @@ -15,6 +15,7 @@ #define __ARCH_I386_POSIX_TYPES_H #define _ASM_X86_POSIX_TYPES_32_H #define _ASM_X86_POSIX_TYPES_64_H + typedef unsigned short __kernel_dev_t; typedef unsigned long __kernel_ino_t; typedef unsigned short __kernel_mode_t; diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h index 73f6ffb54..b2f73412e 100644 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h @@ -4,8 +4,17 @@ * our private content, and not the kernel header, will win. * -Erik */ -#ifndef _ASM_X86_64_POSIX_TYPES_H + +/* a hack for compiling a 32 bit user space with 64 bit + * kernel on x86_64 */ +#if !defined(__ARCH_I386_POSIX_TYPES_H) && \ + !defined(_ASM_X86_64_POSIX_TYPES_H) && \ + !defined(_ASM_X86_POSIX_TYPES_32_H) && \ + !defined(_ASM_X86_POSIX_TYPES_64_H) #define _ASM_X86_64_POSIX_TYPES_H +#define __ARCH_I386_POSIX_TYPES_H +#define _ASM_X86_POSIX_TYPES_32_H +#define _ASM_X86_POSIX_TYPES_64_H typedef unsigned long __kernel_dev_t; typedef unsigned long __kernel_ino_t; -- cgit v1.2.3