The bits/kernel_types.h file breaks every other kernel release, it's a horrible hack that _really_ needs to be dealt with properly someday.
This time, the 32 bit and 64 bit SH architectures were merged, so now the guards look like: #ifndef __ASM_SH_POSIX_TYPES_32_H #define __ASM_SH_POSIX_TYPES_32_H And the header is instead checking: #ifndef __ASM_SH_POSIX_TYPES_H #define __ASM_SH_POSIX_TYPES_H And thus the build breaks. Attached is a quick stab at fixing it. At some point, a 0.9.30.2 might be nice... Rob -- Latency is more important than throughput. It's that simple. - Linus Torvalds
diff -ru uClibc/libc/sysdeps/linux/sh/bits/kernel_types.h uClibc2/libc/sysdeps/linux/sh/bits/kernel_types.h --- uClibc/libc/sysdeps/linux/sh/bits/kernel_types.h 2008-07-23 06:23:36.000000000 -0500 +++ uClibc2/libc/sysdeps/linux/sh/bits/kernel_types.h 2009-09-17 21:05:29.000000000 -0500 @@ -4,8 +4,9 @@ * our private content, and not the kernel header, will win. * -Erik */ -#ifndef __ASM_SH_POSIX_TYPES_H +#if !defined(__ASM_SH_POSIX_TYPES_H) && !defined(__ASM_SH_POSIX_TYPES_32_H) #define __ASM_SH_POSIX_TYPES_H +#define __ASM_SH_POSIX_TYPES_32_H typedef unsigned short __kernel_dev_t; typedef unsigned long __kernel_ino_t; diff -ru uClibc/libc/sysdeps/linux/sh64/bits/kernel_types.h uClibc2/libc/sysdeps/linux/sh64/bits/kernel_types.h --- uClibc/libc/sysdeps/linux/sh64/bits/kernel_types.h 2008-07-23 06:23:36.000000000 -0500 +++ uClibc2/libc/sysdeps/linux/sh64/bits/kernel_types.h 2009-09-17 21:06:35.000000000 -0500 @@ -16,8 +16,9 @@ * our private content, and not the kernel header, will win. * -Erik */ -#ifndef __ASM_SH64_POSIX_TYPES_H +#if !defined(__ASM_SH64_POSIX_TYPES_H) && !defined(__ASM_SH_POSIX_TYPES_64_H) #define __ASM_SH64_POSIX_TYPES_H +#define __ASM_SH_POSIX_TYPES_64_H typedef unsigned short __kernel_dev_t; typedef unsigned long __kernel_ino_t;
_______________________________________________ uClibc mailing list uClibc@uclibc.org http://lists.busybox.net/mailman/listinfo/uclibc
