svn commit: branches/uClibc-nptl/libc/sysdeps/linux/common/bits

[kraj at uclibc.org]

Author: kraj
Date: 2008-06-24 17:13:12 -0700 (Tue, 24 Jun 2008)
New Revision: 22496

Log:
Sync with trunk.


Modified:
   branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uio.h


Changeset:
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uio.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uio.h	2008-06-24 22:52:14 UTC (rev 22495)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uio.h	2008-06-25 00:13:12 UTC (rev 22496)
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -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>
 
@@ -31,7 +33,7 @@
 /* Size of object which can be written atomically.
 
    This macro has different values in different kernel versions.  The
-   latest versions of ther kernel use 1024 and this is good choice.  Since
+   latest versions of the kernel use 1024 and this is good choice.  Since
    the C library implementation of readv/writev is able to emulate the
    functionality even if the currently running kernel does not support
    this large value the readv/writev call will not fail because of this.  */
@@ -45,3 +47,5 @@
     void *iov_base;	/* Pointer to data.  */
     size_t iov_len;	/* Length of data.  */
   };
+
+#endif