xnu-1699.26.8.tar.gz

[apple/xnu.git] / bsd / sys / uio.h

diff --git a/bsd/sys/uio.h b/bsd/sys/uio.h
index 6bc41a6a38a5534219d6631a413858c5af3ceb04..1c48b49cdd6c34eaaca9ecb35829d304c68d9346 100644 (file)
--- a/bsd/sys/uio.h
+++ b/bsd/sys/uio.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -94,7 +94,7 @@ struct iovec {
 #endif
 
 
 #endif
 
 

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 /*
  * IO direction for uio_t.
  *     UIO_READ - data moves into iovec(s) associated with uio_t
 /*
  * IO direction for uio_t.
  *     UIO_READ - data moves into iovec(s) associated with uio_t


@@ -119,15 +119,15 @@ enum uio_rw { UIO_READ, UIO_WRITE };
  * NOTES - 
  *     UIO_USERSPACE is equivalent to UIO_USERSPACE32, but UIO_USERSPACE32
  *             is preferred.  UIO_USERSPACE remains for backwards compatibility.
  * NOTES - 
  *     UIO_USERSPACE is equivalent to UIO_USERSPACE32, but UIO_USERSPACE32
  *             is preferred.  UIO_USERSPACE remains for backwards compatibility.

- *     UIO_SYSSPACE is equivalent to UIO_SYSSPACE32, but UIO_SYSSPACE32
- *             is preferred.  UIO_SYSSPACE remains for backwards compatibility.
+ *     UIO_SYSSPACE is equivalent to UIO_SYSSPACE32, but UIO_SYSSPACE
+ *             is preferred.

  */
 enum uio_seg {
        UIO_USERSPACE           = 0,    /* kernel address is virtual,  to/from user virtual */
        UIO_SYSSPACE            = 2,    /* kernel address is virtual,  to/from system virtual */
        UIO_USERSPACE32         = 5,    /* kernel address is virtual,  to/from user 32-bit virtual */
        UIO_USERSPACE64         = 8,    /* kernel address is virtual,  to/from user 64-bit virtual */
  */
 enum uio_seg {
        UIO_USERSPACE           = 0,    /* kernel address is virtual,  to/from user virtual */
        UIO_SYSSPACE            = 2,    /* kernel address is virtual,  to/from system virtual */
        UIO_USERSPACE32         = 5,    /* kernel address is virtual,  to/from user 32-bit virtual */
        UIO_USERSPACE64         = 8,    /* kernel address is virtual,  to/from user 64-bit virtual */

-       UIO_SYSSPACE32          = 11    /* kernel address is virtual,  to/from system virtual */
+       UIO_SYSSPACE32          = 11    /* deprecated */

 };
 
 #define UIO_SEG_IS_USER_SPACE( a_uio_seg )  \
 };
 
 #define UIO_SEG_IS_USER_SPACE( a_uio_seg )  \


@@ -257,10 +257,8 @@ user_size_t uio_curriovlen( uio_t a_uio );
 #define UIO_MAXIOV     1024            /* max 1K of iov's */
 #define UIO_SMALLIOV   8               /* 8 on stack, else malloc */
 
 #define UIO_MAXIOV     1024            /* max 1K of iov's */
 #define UIO_SMALLIOV   8               /* 8 on stack, else malloc */
 

-extern int uiomove(caddr_t cp, int n, struct uio *uio);
-extern int uiomove64(unsigned long long cp, int n, struct uio *uio);
-extern int ureadc(int c, struct uio *uio);
-extern int uwritec(struct uio *uio);
+extern int uiomove(const char * cp, int n, struct uio *uio);
+extern int uiomove64(const __uint64_t cp, int n, struct uio *uio);

 __END_DECLS
 
 #endif /* KERNEL */
 __END_DECLS
 
 #endif /* KERNEL */


@@ -268,8 +266,8 @@ __END_DECLS
 #ifndef        KERNEL
 
 __BEGIN_DECLS
 #ifndef        KERNEL
 
 __BEGIN_DECLS

-ssize_t        readv(int, const struct iovec *, int);
-ssize_t        writev(int, const struct iovec *, int);
+ssize_t        readv(int, const struct iovec *, int) __DARWIN_ALIAS_C(readv);
+ssize_t        writev(int, const struct iovec *, int) __DARWIN_ALIAS_C(writev);

 __END_DECLS
 #endif /* !KERNEL */
 
 __END_DECLS
 #endif /* !KERNEL */