xnu-7195.81.3.tar.gz

[apple/xnu.git] / osfmk / libsa / types.h

diff --git a/osfmk/libsa/types.h b/osfmk/libsa/types.h
index 2d72826162c03603d30d7fe8eeffc722b24faeba..d2aaeb6acb7a38add0e4092958d0e82e6668693d 100644 (file)
--- a/osfmk/libsa/types.h
+++ b/osfmk/libsa/types.h
@@ -1,17 +1,20 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
  * 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.
- * 
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -19,15 +22,15 @@
  * 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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * HISTORY
- * 
+ *
  * Revision 1.1.1.1  1998/09/22 21:05:51  wsanchez
  * Import of Mac OS X kernel (~semeria)
  *
@@ -35,8 +38,8 @@
  * Import of OSF Mach kernel (~mburg)
  *
  * Revision 1.1.2.1  1996/09/17  16:56:21  bruel
- *     created from standalone mach servers.
- *     [96/09/17            bruel]
+ *      created from standalone mach servers.
+ *      [96/09/17            bruel]
  *
  * $EndLog$
  */
@@ -44,50 +47,62 @@
 #ifndef _MACH_TYPES_H_
 #define _MACH_TYPES_H_
 
-#include "machine/types.h"
+#include <stddef.h>
+#include "libsa/machine/types.h"
 
-#ifndef        _SIZE_T
+#ifndef _SIZE_T
 #define _SIZE_T
-typedef unsigned long  size_t;
-#endif /* _SIZE_T */
+typedef unsigned long   size_t;
+#endif  /* _SIZE_T */
 
 /*
  * Common type definitions that lots of old files seem to want.
  */
 
-typedef        unsigned char   u_char;         /* unsigned char */
-typedef        unsigned short  u_short;        /* unsigned short */
-typedef        unsigned int    u_int;          /* unsigned int */
-typedef        unsigned long   u_long;         /* unsigned long */
+typedef unsigned char   u_char;         /* unsigned char */
+typedef unsigned short  u_short;        /* unsigned short */
+typedef unsigned int    u_int;          /* unsigned int */
+typedef unsigned long   u_long;         /* unsigned long */
 
 typedef struct _quad_ {
-       unsigned int    val[2];         /* 2 32-bit values make... */
-} quad;                                        /* an 8-byte item */
+       unsigned int    val[2];         /* 2 32-bit values make... */
+} quad;                                 /* an 8-byte item */
 
-typedef        char *          caddr_t;        /* address of a (signed) char */
+typedef char *          caddr_t;        /* address of a (signed) char */
 
-typedef int            time_t;         /* a signed 32    */
-typedef unsigned int   daddr_t;        /* an unsigned 32 */
-typedef        unsigned int    off_t;          /* another unsigned 32 */
+typedef unsigned int    daddr_t;        /* an unsigned 32 */
+#if 0 /* off_t should be 64-bit ! */
+typedef unsigned int    off_t;          /* another unsigned 32 */
+#endif
 
 
-#define        major(i)        (((i) >> 8) & 0xFF)
-#define        minor(i)        ((i) & 0xFF)
-#define        makedev(i,j)    ((((i) & 0xFF) << 8) | ((j) & 0xFF))
+#define major(i)        (((i) >> 8) & 0xFF)
+#define minor(i)        ((i) & 0xFF)
+#define makedev(i, j)    ((((i) & 0xFF) << 8) | ((j) & 0xFF))
 
-#ifndef        NULL
-#define        NULL            ((void *) 0)    /* the null pointer */
+#ifndef NULL
+#define NULL            ((void *) 0)    /* the null pointer */
 #endif
 
 /*
  * Shorthand type definitions for unsigned storage classes
  */
-typedef        unsigned char   uchar_t;
-typedef        unsigned short  ushort_t;
-typedef        unsigned int    uint_t;
-typedef unsigned long  ulong_t;
-typedef        volatile unsigned char  vuchar_t;
-typedef        volatile unsigned short vushort_t;
-typedef        volatile unsigned int   vuint_t;
-typedef volatile unsigned long vulong_t;
-#endif /* _MACH_TYPES_H_ */
+typedef unsigned char   uchar_t;
+typedef unsigned short  ushort_t;
+typedef unsigned int    uint_t;
+typedef unsigned long   ulong_t;
+typedef volatile unsigned char  vuchar_t;
+typedef volatile unsigned short vushort_t;
+typedef volatile unsigned int   vuint_t;
+typedef volatile unsigned long  vulong_t;
+
+/*
+ * Deprecation macro
+ */
+#if __GNUC__ >= 3
+#define __deprecated    __attribute__((__deprecated__))
+#else
+#define __deprecated /* nothing */
+#endif
+
+#endif  /* _MACH_TYPES_H_ */