[LV-tools-commit] toolchain/patches uclibc-000000-base.patch,1.2,1.3

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/toolchain/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6440

Modified Files:
	uclibc-000000-base.patch 
Log Message:
- Manipulate a header a bit to hopefully allow real-world apps to compile...


Index: uclibc-000000-base.patch
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/patches/uclibc-000000-base.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- uclibc-000000-base.patch	23 Sep 2005 15:30:49 -0000	1.2
+++ uclibc-000000-base.patch	10 Oct 2005 12:44:45 -0000	1.3
@@ -611,15 +611,17 @@
 diff -Nurp -x entries uClibc/libc/sysdeps/linux/vax/bits/kernel_types.h uClibc-hacked-vax/libc/sysdeps/linux/vax/bits/kernel_types.h
 --- uClibc/libc/sysdeps/linux/vax/bits/kernel_types.h	1970-01-01 01:00:00.000000000 +0100
 +++ uClibc-hacked-vax/libc/sysdeps/linux/vax/bits/kernel_types.h	2005-05-08 14:05:08.000000000 +0200
-@@ -0,0 +1,43 @@
-+/* Note that we use the exact same include guard #define names
+@@ -0,0 +1,45 @@
++#ifndef __ARCH_VAX_POSIX_TYPES_H
++#define __ARCH_VAX_POSIX_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_VAX_POSIX_TYPES_H
-+#define __ARCH_VAX_POSIX_TYPES_H
 +
 +typedef unsigned short	__kernel_dev_t;
 +typedef unsigned long	__kernel_ino_t;
@@ -647,14 +649,14 @@
 +typedef long long	__kernel_loff_t;
 +
 +typedef struct {
-+#ifdef __USE_ALL
++#if defined(__KERNEL__) || defined(__USE_ALL)
 +	int val[2];
 +#else
 +	int __val[2];
 +#endif
 +} __kernel_fsid_t;
 +
-+#endif /* __ARCH_I386_POSIX_TYPES_H */
++#endif /* __ARCH_VAX_POSIX_TYPES_H */
 diff -Nurp -x entries uClibc/libc/sysdeps/linux/vax/bits/machine-gmon.h uClibc-hacked-vax/libc/sysdeps/linux/vax/bits/machine-gmon.h
 --- uClibc/libc/sysdeps/linux/vax/bits/machine-gmon.h	1970-01-01 01:00:00.000000000 +0100
 +++ uClibc-hacked-vax/libc/sysdeps/linux/vax/bits/machine-gmon.h	2005-05-08 14:05:08.000000000 +0200