xnu-792.6.61.tar.gz

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

diff --git a/bsd/sys/ev.h b/bsd/sys/ev.h
index 30ee688f40e5933a50209f7f37a32ae98268e94a..39c4aeb617bce263063a0f990e72eb6175d5443d 100644 (file)
--- a/bsd/sys/ev.h
+++ b/bsd/sys/ev.h
@@ -1,24 +1,21 @@
 /*
 /*

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

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

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -27,9 +24,12 @@
 #ifndef _SYS_EV_H_
 #define _SYS_EV_H_
 
 #ifndef _SYS_EV_H_
 #define _SYS_EV_H_
 

+#if !defined(__LP64__)
+

 #include <sys/appleapiopts.h>
 
 #include <sys/queue.h>
 #include <sys/appleapiopts.h>
 
 #include <sys/queue.h>

+#include <sys/cdefs.h>

 
 struct eventreq {
   int      er_type;
 
 struct eventreq {
   int      er_type;


@@ -62,8 +62,7 @@ typedef struct eventreq *er_t;
 #define EV_TIMEOUT 0x20000
 #define EV_DMASK   0xffffff00
 
 #define EV_TIMEOUT 0x20000
 #define EV_DMASK   0xffffff00
 

-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE

 
 struct eventqelt {
   TAILQ_ENTRY(eventqelt)  ee_slist;
 
 struct eventqelt {
   TAILQ_ENTRY(eventqelt)  ee_slist;


@@ -71,12 +70,13 @@ struct eventqelt {
   struct eventreq  ee_req;
   struct proc *    ee_proc;
   u_int            ee_flags;
   struct eventreq  ee_req;
   struct proc *    ee_proc;
   u_int            ee_flags;

-#define EV_QUEUED 1
+#define EV_QUEUED      0x01

   u_int            ee_eventmask;
   u_int            ee_eventmask;

-  struct socket   *ee_sp;

 };
 
 };
 

-#endif /* __APPLE_API_PRIVATE */
-#endif /* KERNEL */
+int waitevent_close(struct proc *p, struct fileproc *);
+#endif /* BSD_KERNEL_PRIVATE */
+
+#endif /* !defined(__LP64__) */

 
 #endif /* _SYS_EV_H_ */
 
 #endif /* _SYS_EV_H_ */