xnu-1228.0.2.tar.gz

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

diff --git a/bsd/sys/file.h b/bsd/sys/file.h
index d1cb183b80d94ed4aa62e6b345ccfcb6df42db2d..9bf925acb8f25d60e362d80769d100fb3a70e980 100644 (file)
--- a/bsd/sys/file.h
+++ b/bsd/sys/file.h
@@ -1,5 +1,5 @@
 /*
 /*

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

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


@@ -76,9 +76,13 @@
 #include <sys/kernel_types.h>
 #endif
 
 #include <sys/kernel_types.h>
 #endif
 

-#if __DARWIN_ALIGN_POWER
-#pragma options align=power
-#endif
+#ifndef _KAUTH_CRED_T
+#define        _KAUTH_CRED_T
+struct ucred;
+typedef struct ucred *kauth_cred_t;
+#endif /* !_KAUTH_CRED_T */
+
+#pragma pack(4)

 
 /* for the compat sake;  */
 struct extern_file {
 
 /* for the compat sake;  */
 struct extern_file {


@@ -87,15 +91,13 @@ struct extern_file {
        short   f_type;         /* descriptor type */
        short   f_count;        /* reference count */
        short   f_msgcount;     /* references from message queue */
        short   f_type;         /* descriptor type */
        short   f_count;        /* reference count */
        short   f_msgcount;     /* references from message queue */

-       struct  ucred *f_cred;  /* credentials associated with descriptor */
+       kauth_cred_t f_cred;    /* credentials associated with descriptor */

        void * f_ops;
        off_t   f_offset;
        caddr_t f_data;         /* vnode or socket or SHM or semaphore */
 };
 
        void * f_ops;
        off_t   f_offset;
        caddr_t f_data;         /* vnode or socket or SHM or semaphore */
 };
 

-#if __DARWIN_ALIGN_POWER
-#pragma options align=reset
-#endif
+#pragma pack()

 
 #ifdef KERNEL
 __BEGIN_DECLS
 
 #ifdef KERNEL
 __BEGIN_DECLS