xnu-792.6.22.tar.gz

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

diff --git a/bsd/sys/poll.h b/bsd/sys/poll.h
index 443469915f44d26faeec3a9cf0a2d0654cd081f7..7c1077722be2e39923fb885860ada205e06f6271 100644 (file)
--- a/bsd/sys/poll.h
+++ b/bsd/sys/poll.h
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -51,9 +51,6 @@
 #ifndef _SYS_POLL_H_
 #define        _SYS_POLL_H_
 
 #ifndef _SYS_POLL_H_
 #define        _SYS_POLL_H_
 

-#include <sys/appleapiopts.h>
-
-#ifdef __APPLE_API_PRIVATE

 /*
  * This file is intended to be compatable with the traditional poll.h.
  */
 /*
  * This file is intended to be compatable with the traditional poll.h.
  */


@@ -61,12 +58,6 @@
 /*
  * Requestable events.  If poll(2) finds any of these set, they are
  * copied to revents on return.
 /*
  * Requestable events.  If poll(2) finds any of these set, they are
  * copied to revents on return.

- * XXX Note that FreeBSD doesn't make much distinction between POLLPRI
- * and POLLRDBAND since none of the file types have distinct priority
- * bands - and only some have an urgent "mode".
- * XXX Note POLLIN isn't really supported in true SVSV terms.  Under SYSV
- * POLLIN includes all of normal, band and urgent data.  Most poll handlers
- * on FreeBSD only treat it as "normal" data.

  */
 #define        POLLIN          0x0001          /* any readable data available */
 #define        POLLPRI         0x0002          /* OOB/Urgent readable data */
  */
 #define        POLLIN          0x0001          /* any readable data available */
 #define        POLLPRI         0x0002          /* OOB/Urgent readable data */


@@ -78,7 +69,7 @@
 
 /*
  * FreeBSD extensions: polling on a regular file might return one
 
 /*
  * FreeBSD extensions: polling on a regular file might return one

- * of these events (currently only supported on UFS).
+ * of these events (currently only supported on local filesystems).

  */
 #define        POLLEXTEND      0x0200          /* file may have been extended */
 #define        POLLATTRIB      0x0400          /* file attributes may have changed */
  */
 #define        POLLEXTEND      0x0200          /* file may have been extended */
 #define        POLLATTRIB      0x0400          /* file attributes may have changed */


@@ -96,6 +87,29 @@
 #define        POLLSTANDARD    (POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
                         POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
 
 #define        POLLSTANDARD    (POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
                         POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
 

-#endif /* __APPLE_API_PRIVATE */
+struct pollfd
+{
+       int     fd;
+       short   events;
+       short   revents;
+};
+
+typedef unsigned int nfds_t;
+
+#if !defined(KERNEL)
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+/*
+ * This is defined here (instead of <poll.h>) because this is where
+ * traditional SVR4 code will look to find it.
+ */
+extern int poll (struct pollfd *, nfds_t, int);
+
+__END_DECLS
+
+#endif /* !KERNEL */

 
 #endif /* !_SYS_POLL_H_ */
 
 #endif /* !_SYS_POLL_H_ */