xnu-1456.1.26.tar.gz

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

diff --git a/osfmk/libsa/types.h b/osfmk/libsa/types.h
index 2d72826162c03603d30d7fe8eeffc722b24faeba..ca12b7efb8009f40309034c3fb90fbfa948d9626 100644 (file)
--- a/osfmk/libsa/types.h
+++ b/osfmk/libsa/types.h
@@ -1,16 +1,19 @@
 /*
  * 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
@@ -20,7 +23,7 @@
  * 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@
@@ -44,7 +47,7 @@
 #ifndef _MACH_TYPES_H_
 #define _MACH_TYPES_H_
 
-#include "machine/types.h"
+#include "libsa/machine/types.h"
 
 #ifndef        _SIZE_T
 #define _SIZE_T
@@ -68,7 +71,9 @@ typedef       char *          caddr_t;        /* address of a (signed) char */
 
 typedef int            time_t;         /* a signed 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)
@@ -90,4 +95,14 @@ 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_ */