summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-08-23 20:28:56 +0000
committerMike Frysinger <vapier@gentoo.org>2006-08-23 20:28:56 +0000
commite2170c5ed9f7ad7c71c59f31f7e156a04ddaf16e (patch)
tree15300347515d3272ce7d93c05c1a0ddc9d0417ee
parent0814bdad52c764ec4f3c010e78d7cdb6418e64e0 (diff)
sync with upstream via psm
-rw-r--r--libc/sysdeps/linux/common/bits/uio.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/libc/sysdeps/linux/common/bits/uio.h b/libc/sysdeps/linux/common/bits/uio.h
index 84b4805fe..6a283ed77 100644
--- a/libc/sysdeps/linux/common/bits/uio.h
+++ b/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.
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. */
@@ -44,3 +46,5 @@ struct iovec
void *iov_base; /* Pointer to data. */
size_t iov_len; /* Length of data. */
};
+
+#endif