Browse Source

sync with upstream via psm

Mike Frysinger 19 years ago
parent
commit
e2170c5ed9
1 changed files with 7 additions and 3 deletions
  1. 7 3
      libc/sysdeps/linux/common/bits/uio.h

+ 7 - 3
libc/sysdeps/linux/common/bits/uio.h

@@ -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.
    This file is part of the GNU C Library.
 
 
    The GNU C Library is free software; you can redistribute it and/or
    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
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
    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."
 # error "Never include <bits/uio.h> directly; use <sys/uio.h> instead."
 #endif
 #endif
 
 
+#ifndef _BITS_UIO_H
+#define _BITS_UIO_H	1
 
 
 #include <sys/types.h>
 #include <sys/types.h>
 
 
@@ -31,7 +33,7 @@
 /* Size of object which can be written atomically.
 /* Size of object which can be written atomically.
 
 
    This macro has different values in different kernel versions.  The
    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
    the C library implementation of readv/writev is able to emulate the
    functionality even if the currently running kernel does not support
    functionality even if the currently running kernel does not support
    this large value the readv/writev call will not fail because of this.  */
    this large value the readv/writev call will not fail because of this.  */
@@ -44,3 +46,5 @@ struct iovec
     void *iov_base;	/* Pointer to data.  */
     void *iov_base;	/* Pointer to data.  */
     size_t iov_len;	/* Length of data.  */
     size_t iov_len;	/* Length of data.  */
   };
   };
+
+#endif