CF-1153.18.tar.gz

[apple/cf.git] / CFStringEncodingExt.h

diff --git a/CFStringEncodingExt.h b/CFStringEncodingExt.h
index 06155fb44e973eee5fc9b3feba60302a084fc5c4..d11deade1ba6b981cb9f56857aa796568a6de93e 100644 (file)
--- a/CFStringEncodingExt.h
+++ b/CFStringEncodingExt.h
@@ -1,15 +1,15 @@
 /*
- * Copyright (c) 2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2015 Apple Inc. All rights reserved.
  *
  * @APPLE_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.
- * 
+ *
  * 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,
@@ -17,12 +17,12 @@
  * 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@
  */
 
 /*     CFStringEncodingExt.h
-       Copyright (c) 1998-2009, Apple Inc. All rights reserved.
+       Copyright (c) 1998-2014, Apple Inc. All rights reserved.
 */
 
 #if !defined(__COREFOUNDATION_CFSTRINGENCODINGEXT__)
@@ -32,7 +32,7 @@
 
 CF_EXTERN_C_BEGIN
 
-enum {
+typedef CF_ENUM(CFIndex, CFStringEncodings) {
 /*  kCFStringEncodingMacRoman = 0L, defined in CoreFoundation/CFString.h */
     kCFStringEncodingMacJapanese = 1,
     kCFStringEncodingMacChineseTrad = 2,
@@ -101,9 +101,7 @@ enum {
     kCFStringEncodingISOLatin7 = 0x020D,       /* ISO 8859-13 */
     kCFStringEncodingISOLatin8 = 0x020E,       /* ISO 8859-14 */
     kCFStringEncodingISOLatin9 = 0x020F,       /* ISO 8859-15 */
-#if MAC_OS_X_VERSION_10_4 <= MAC_OS_X_VERSION_MAX_ALLOWED
     kCFStringEncodingISOLatin10 = 0x0210,      /* ISO 8859-16 */
-#endif
 
     /* MS-DOS & Windows encodings begin at 0x400 */
     kCFStringEncodingDOSLatinUS = 0x0400,      /* code page 437 */
@@ -140,20 +138,14 @@ enum {
 
     /* Various national standards begin at 0x600 */
 /*  kCFStringEncodingASCII = 0x0600, defined in CoreFoundation/CFString.h */
-#if MAC_OS_X_VERSION_10_4 <= MAC_OS_X_VERSION_MAX_ALLOWED
     kCFStringEncodingANSEL = 0x0601,   /* ANSEL (ANSI Z39.47) */
-#endif
     kCFStringEncodingJIS_X0201_76 = 0x0620,
     kCFStringEncodingJIS_X0208_83 = 0x0621,
     kCFStringEncodingJIS_X0208_90 = 0x0622,
     kCFStringEncodingJIS_X0212_90 = 0x0623,
     kCFStringEncodingJIS_C6226_78 = 0x0624,
-#if MAC_OS_X_VERSION_10_5 <= MAC_OS_X_VERSION_MAX_ALLOWED
-    kCFStringEncodingShiftJIS_X0213 = 0x0628, /* Shift-JIS format encoding of JIS X0213 planes 1 and 2*/
-#endif
-#if MAC_OS_X_VERSION_10_4 <= MAC_OS_X_VERSION_MAX_ALLOWED
+    kCFStringEncodingShiftJIS_X0213 CF_ENUM_AVAILABLE(10_5, 2_0) = 0x0628, /* Shift-JIS format encoding of JIS X0213 planes 1 and 2*/
     kCFStringEncodingShiftJIS_X0213_MenKuTen = 0x0629, /* JIS X0213 in plane-row-column notation */
-#endif
     kCFStringEncodingGB_2312_80 = 0x0630,
     kCFStringEncodingGBK_95 = 0x0631,          /* annex to GB 13000-93; for Windows 95 */
     kCFStringEncodingGB_18030_2000 = 0x0632,
@@ -185,31 +177,24 @@ enum {
     kCFStringEncodingMacRomanLatin1 = 0x0A04,  /* Mac OS Roman permuted to align with ISO Latin-1 */
     kCFStringEncodingHZ_GB_2312 = 0x0A05,      /* HZ (RFC 1842, for Chinese mail & news) */
     kCFStringEncodingBig5_HKSCS_1999 = 0x0A06, /* Big-5 with Hong Kong special char set supplement*/
-#if MAC_OS_X_VERSION_10_4 <= MAC_OS_X_VERSION_MAX_ALLOWED
     kCFStringEncodingVISCII = 0x0A07,  /* RFC 1456, Vietnamese */
     kCFStringEncodingKOI8_U = 0x0A08,  /* RFC 2319, Ukrainian */
     kCFStringEncodingBig5_E = 0x0A09,  /* Taiwan Big-5E standard */
-#endif
 
     /* Other platform encodings*/
 /*  kCFStringEncodingNextStepLatin = 0x0B01, defined in CoreFoundation/CFString.h */
-#if MAC_OS_X_VERSION_10_4 <= MAC_OS_X_VERSION_MAX_ALLOWED
     kCFStringEncodingNextStepJapanese = 0x0B02,        /* NextStep Japanese encoding */
-#endif
 
     /* EBCDIC & IBM host encodings begin at 0xC00 */
     kCFStringEncodingEBCDIC_US = 0x0C01,       /* basic EBCDIC-US */
     kCFStringEncodingEBCDIC_CP037 = 0x0C02,    /* code page 037, extended EBCDIC (Latin-1 set) for US,Canada... */
 
-#if MAC_OS_X_VERSION_10_6 <= MAC_OS_X_VERSION_MAX_ALLOWED
-    kCFStringEncodingUTF7 = 0x04000100, /* kTextEncodingUnicodeDefault + kUnicodeUTF7Format RFC2152 */
-    kCFStringEncodingUTF7_IMAP = 0x0A10, /* UTF-7 (IMAP folder variant) RFC3501 */
-#endif /* MAC_OS_X_VERSION_10_6 <= MAC_OS_X_VERSION_MAX_ALLOWED */
+    kCFStringEncodingUTF7 CF_ENUM_AVAILABLE(10_6, 4_0) = 0x04000100, /* kTextEncodingUnicodeDefault + kUnicodeUTF7Format RFC2152 */
+    kCFStringEncodingUTF7_IMAP CF_ENUM_AVAILABLE(10_6, 4_0) = 0x0A10, /* UTF-7 (IMAP folder variant) RFC3501 */
 
     /* Deprecated constants */
     kCFStringEncodingShiftJIS_X0213_00 = 0x0628 /* Shift-JIS format encoding of JIS X0213 planes 1 and 2 (DEPRECATED) */
 };
-typedef CFIndex CFStringEncodings;
 
 CF_EXTERN_C_END