r1725 - in glibc-package/branches/glibc-2.4/debian: . patches patches/any
Author: aurel32
Date: 2006-08-15 09:21:16 +0000 (Tue, 15 Aug 2006)
New Revision: 1725
Added:
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-uio_h.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Add any/cvs-uio_h.diff from upstream to allow inclusion of bits/uio.h from
fcntl.h and prevent multiple inclusions.
Note: this should fix FTBFS on arm and partly on hppa.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-14 23:24:20 UTC (rev 1724)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-15 09:21:16 UTC (rev 1725)
@@ -73,6 +73,8 @@
* Remove any/cvs-path_log.diff (merged upstream).
* Remove any/cvs-resource_h.diff (merged upstream).
* Remove any/cvs-tls-crashfix.diff (merged upstream).
+ * Add any/cvs-uio_h.diff from upstream to allow inclusion of bits/uio.h from
+ fcntl.h and prevent multiple inclusions.
* Remove any/local-kernel-features.diff (merged upstream).
* Update any/local-ldso-disable-hwcap.diff.
* Update any/local-linuxthreads-sizefix.diff.
Added: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-uio_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/cvs-uio_h.diff 2006-08-14 23:24:20 UTC (rev 1724)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/cvs-uio_h.diff 2006-08-15 09:21:16 UTC (rev 1725)
@@ -0,0 +1,33 @@
+2006-04-27 Ulrich Drepper <drepper@redhat.com>
+
+ * Protect against multiple inclusion.
+
+ * Allow inclusion from <fcntl.h>.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/bits/uio.h,v
+retrieving revision 1.4
+retrieving revision 1.6
+diff -u -r1.4 -r1.6
+--- libc/sysdeps/unix/sysv/linux/bits/uio.h 2006/04/26 22:12:30 1.4
++++ libc/sysdeps/unix/sysv/linux/bits/uio.h 2006/04/27 04:10:30 1.6
+@@ -16,10 +16,12 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+-#ifndef _SYS_UIO_H
++#if !defined _SYS_UIO_H && !defined _FCNTL_H
+ # error "Never include <bits/uio.h> directly; use <sys/uio.h> instead."
+ #endif
+
++#ifndef _BITS_UIO_H
++#define _BITS_UIO_H 1
+
+ #include <sys/types.h>
+
+@@ -44,3 +46,5 @@
+ void *iov_base; /* Pointer to data. */
+ size_t iov_len; /* Length of data. */
+ };
++
++#endif
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-14 23:24:20 UTC (rev 1724)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-15 09:21:16 UTC (rev 1725)
@@ -105,6 +105,7 @@
all/submitted-uninitialized-byte-LC_CTYPE.diff
any/cvs-getcwd_c.diff -p1
+any/cvs-uio_h.diff -p1
any/cvs-thread_signals.diff -p0
any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
Reply to: