summaryrefslogtreecommitdiffstats
path: root/libc/sysdeps/linux
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2009-01-12 15:04:25 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2009-01-12 15:04:25 +0000
commit985ad3a6ed4884c2188bc3733c6c4eccb5839b80 (patch)
treecedf9bd645a1cbff31dd34a7f8d400a6ad2a76ef /libc/sysdeps/linux
parent07439d8df31d7fefe82ff127a1690193a34e9060 (diff)
downloaduClibc-alpine-985ad3a6ed4884c2188bc3733c6c4eccb5839b80.tar.bz2
uClibc-alpine-985ad3a6ed4884c2188bc3733c6c4eccb5839b80.tar.xz
- fixup incomplete r24515 (fix redefinitions of posix_types for i386->x86_64 with linux >= 2.6.28)
Diffstat (limited to 'libc/sysdeps/linux')
-rw-r--r--libc/sysdeps/linux/i386/bits/kernel_types.h1
-rw-r--r--libc/sysdeps/linux/x86_64/bits/kernel_types.h11
2 files changed, 11 insertions, 1 deletions
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;