CF-368.11.tar.gz

[apple/cf.git] / Base.subproj / CoreFoundation.h

diff --git a/Base.subproj/CoreFoundation.h b/Base.subproj/CoreFoundation.h
index b8bee17be507ee54c172a3d0394c5c9251bfcb20..1baa64750941bc8b3463ba7b5583d1761be6e858 100644 (file)
--- a/Base.subproj/CoreFoundation.h
+++ b/Base.subproj/CoreFoundation.h
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 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.
- * 

  * 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
  * 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


@@ -23,29 +21,14 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 /*     CoreFoundation.h
  * @APPLE_LICENSE_HEADER_END@
  */
 /*     CoreFoundation.h

-       Copyright (c) 1998-2003, Apple, Inc. All rights reserved.
+       Copyright (c) 1998-2005, Apple, Inc. All rights reserved.

 */
 
 #if !defined(__COREFOUNDATION_COREFOUNDATION__)
 #define __COREFOUNDATION_COREFOUNDATION__ 1
 */
 
 #if !defined(__COREFOUNDATION_COREFOUNDATION__)
 #define __COREFOUNDATION_COREFOUNDATION__ 1

+#define __COREFOUNDATION__ 1

 
 

-#include <CoreFoundation/CFBase.h>
-#include <CoreFoundation/CFArray.h>
-#include <CoreFoundation/CFBag.h>
-#include <CoreFoundation/CFCharacterSet.h>
-#include <CoreFoundation/CFData.h>
-#include <CoreFoundation/CFDate.h>
-#include <CoreFoundation/CFDictionary.h>
-#include <CoreFoundation/CFNumber.h>
-#include <CoreFoundation/CFPropertyList.h>
-#include <CoreFoundation/CFSet.h>
-#include <CoreFoundation/CFString.h>
-#include <CoreFoundation/CFTimeZone.h>
-#include <CoreFoundation/CFTree.h>
-#include <CoreFoundation/CFURL.h>
-#include <CoreFoundation/CFXMLNode.h>
-#include <CoreFoundation/CFXMLParser.h>
-
+#include <sys/types.h>

 #include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>


@@ -65,30 +48,56 @@
 #if defined(__STDC_VERSION__) && (199901L <= __STDC_VERSION__)
 
 #include <inttypes.h>
 #if defined(__STDC_VERSION__) && (199901L <= __STDC_VERSION__)
 
 #include <inttypes.h>

-//#include <iso646.h>

 #include <stdbool.h>
 #include <stdint.h>
 
 #endif
 
 #include <stdbool.h>
 #include <stdint.h>
 
 #endif
 

+#include <CoreFoundation/CFBase.h>
+#include <CoreFoundation/CFArray.h>
+#include <CoreFoundation/CFBag.h>
+#include <CoreFoundation/CFCharacterSet.h>
+#include <CoreFoundation/CFData.h>
+#include <CoreFoundation/CFDate.h>
+#include <CoreFoundation/CFDictionary.h>
+#include <CoreFoundation/CFNumber.h>
+#include <CoreFoundation/CFPropertyList.h>
+#include <CoreFoundation/CFSet.h>
+#include <CoreFoundation/CFString.h>
+#include <CoreFoundation/CFStringEncodingExt.h>
+#include <CoreFoundation/CFTimeZone.h>
+#include <CoreFoundation/CFTree.h>
+#include <CoreFoundation/CFURL.h>
+#include <CoreFoundation/CFXMLNode.h>
+#include <CoreFoundation/CFXMLParser.h>
+
+#if defined(__MACH__) || defined(__WIN32__)
+#include <CoreFoundation/CFMachPort.h>
+#include <CoreFoundation/CFMessagePort.h>
+#include <CoreFoundation/CFRunLoop.h>
+#include <CoreFoundation/CFSocket.h>
+#endif
+

 #include <CoreFoundation/CFBinaryHeap.h>
 #include <CoreFoundation/CFBitVector.h>
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFByteOrder.h>
 #include <CoreFoundation/CFPlugIn.h>
 #include <CoreFoundation/CFBinaryHeap.h>
 #include <CoreFoundation/CFBitVector.h>
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFByteOrder.h>
 #include <CoreFoundation/CFPlugIn.h>

+#include <CoreFoundation/CFPreferences.h>

 #include <CoreFoundation/CFURLAccess.h>
 #include <CoreFoundation/CFUUID.h>
 
 #include <CoreFoundation/CFURLAccess.h>
 #include <CoreFoundation/CFUUID.h>
 

+#include <CoreFoundation/CFLocale.h>
+
+#include <CoreFoundation/CFStream.h>
+

 #if defined(__MACH__)
 #if defined(__MACH__)

+
+

 #include <CoreFoundation/CFUserNotification.h>
 #include <CoreFoundation/CFUserNotification.h>

-#endif

 
 

-#if defined(__MACH__) || defined(__WIN32__)
-#include <CoreFoundation/CFMachPort.h>
-#include <CoreFoundation/CFMessagePort.h>
-#include <CoreFoundation/CFRunLoop.h>
-#include <CoreFoundation/CFSocket.h>
-#endif
+
+#endif // __MACH__

 
 
 #endif /* ! __COREFOUNDATION_COREFOUNDATION__ */
 
 
 #endif /* ! __COREFOUNDATION_COREFOUNDATION__ */