xnu-3789.21.4.tar.gz

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

diff --git a/osfmk/libsa/types.h b/osfmk/libsa/types.h
index ec12bec91fb4eb533bcd75a52176b06ecf2faf1b..341e42b0e1bba75d8e8236ae1a4ff7c34ccee6a3 100644 (file)
--- a/osfmk/libsa/types.h
+++ b/osfmk/libsa/types.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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@
@@ -41,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
@@ -63,9 +69,10 @@ typedef struct _quad_ {
 
 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)
@@ -87,4 +94,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_ */