X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..2d21ac55c334faf3a56e5634905ed6987fc787d4:/bsd/sys/aio.h

diff --git a/bsd/sys/aio.h b/bsd/sys/aio.h
index c28521f84..938583373 100644
--- a/bsd/sys/aio.h
+++ b/bsd/sys/aio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -38,29 +38,49 @@
 #define	_SYS_AIO_H_
 
 #include <sys/signal.h>
+#include <sys/_types.h>
 #include <sys/cdefs.h>
 
+/*
+ * [XSI] Inclusion of the <aio.h> header may make visible symbols defined
+ * in the headers <fcntl.h>, <signal.h>, <sys/types.h>, and <time.h>.
+ * 
+ * In our case, this is limited to struct timespec, off_t and ssize_t.
+ */
+#define __need_struct_timespec
+#include <sys/_structs.h>
+
+#ifndef _OFF_T
+typedef __darwin_off_t	off_t;
+#define _OFF_T
+#endif
+
+#ifndef	_SSIZE_T
+#define	_SSIZE_T
+typedef	__darwin_ssize_t	ssize_t;
+#endif
+
+
 struct aiocb {
-	int					aio_fildes;		/* File descriptor */
-	off_t				aio_offset;		/* File offset */
-	volatile void		*aio_buf;		/* Location of buffer */
-	size_t				aio_nbytes;		/* Length of transfer */
-	int					aio_reqprio;	/* Request priority offset */
-	struct sigevent		aio_sigevent;	/* Signal number and value */
-	int					aio_lio_opcode;	/* Operation to be performed */
+	int		aio_fildes;		/* File descriptor */
+	off_t		aio_offset;		/* File offset */
+	volatile void	*aio_buf;		/* Location of buffer */
+	size_t		aio_nbytes;		/* Length of transfer */
+	int		aio_reqprio;		/* Request priority offset */
+	struct sigevent	aio_sigevent;		/* Signal number and value */
+	int		aio_lio_opcode;		/* Operation to be performed */
 };
 
-// LP64todo - should this move?
 #ifdef KERNEL
 
 struct user_aiocb {
-	int					aio_fildes;		/* File descriptor */
-	off_t				aio_offset;		/* File offset */
-	user_addr_t			aio_buf __attribute((aligned(8)));		/* Location of buffer */
-	user_size_t			aio_nbytes;		/* Length of transfer */
-	int					aio_reqprio;	/* Request priority offset */
+	int		aio_fildes;		/* File descriptor */
+	off_t		aio_offset;		/* File offset */
+	user_addr_t	aio_buf __attribute((aligned(8)));		/* Location of buffer */
+	user_size_t	aio_nbytes;		/* Length of transfer */
+	int		aio_reqprio;	/* Request priority offset */
 	struct user_sigevent aio_sigevent __attribute((aligned(8)));	/* Signal number and value */
-	int					aio_lio_opcode;	/* Operation to be performed */
+	int		aio_lio_opcode;		/* Operation to be performed */
 };
 
 #endif // KERNEL
@@ -221,7 +241,7 @@ ssize_t	aio_return( struct aiocb * aiocbp );
  */
 int		aio_suspend( const struct aiocb *const aiocblist[], 
 					 int nent,
-	 				 const struct timespec * timeoutp );
+	 				 const struct timespec * timeoutp ) __DARWIN_ALIAS_C(aio_suspend);
 	 				 
 /*
  * Write aiocbp->aio_nbytes to the file associated with aiocbp->aio_fildes from