A couple of updates to get headers in line with Mac OS X.

git-svn-id: https://opencflite.svn.sourceforge.net/svnroot/opencflite@108 949b7c4e-b822-e185-8c53-f993a654f32e

icu/unicode/uchar.h

@@ -417,7 +417,11 @@ typedef enum UProperty {
     UCHAR_POSIX_XDIGIT=48,
 #endif /* U_HIDE_DRAFT_API */
     /** One more than the last constant for binary Unicode properties. @stable ICU 2.1 */
+#if DEPLOYMENT_TARGET_MACOSX
+    UCHAR_BINARY_LIMIT=42,
+#else
     UCHAR_BINARY_LIMIT=49,
+#endif
 
     /** Enumerated property Bidi_Class.
         Same as u_charDirection, returns UCharDirection values. @stable ICU 2.2 */
@@ -502,7 +506,11 @@ typedef enum UProperty {
     UCHAR_WORD_BREAK=0x1014,
 #endif /*U_HIDE_DRAFT_API*/
     /** One more than the last constant for enumerated/integer Unicode properties. @stable ICU 2.2 */
+#if DEPLOYMENT_TARGET_MACOSX
+    UCHAR_INT_LIMIT=0x1012,
+#else
     UCHAR_INT_LIMIT=0x1015,
+#endif
 
     /** Bitmask property General_Category_Mask.
         This is the General_Category property returned as a bit mask.
@@ -1262,7 +1270,11 @@ enum UBlockCode {
 #endif /*U_HIDE_DRAFT_API*/
 
     /** @stable ICU 2.0 */
+#if DEPLOYMENT_TARGET_MACOSX
+    UBLOCK_COUNT = 126,
+#else
     UBLOCK_COUNT = 155,
+#endif
 
     /** @stable ICU 2.0 */
     UBLOCK_INVALID_CODE=-1

icu/unicode/uconfig.h

@@ -210,7 +210,11 @@
  * @stable ICU 3.2
  */
 #ifndef UCONFIG_NO_SERVICE
+#if DEPLOYMENT_TARGET_MACOSX 
+#   define UCONFIG_NO_SERVICE 0
+#else
 #   define UCONFIG_NO_SERVICE 1
 #endif
+#endif
 
 #endif

icu/unicode/uversion.h

@@ -67,7 +67,11 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
+#if DEPLOYMENT_TARGET_MACOSX
+#define U_ICU_VERSION_MINOR_NUM 2
+#else
 #define U_ICU_VERSION_MINOR_NUM 6
+#endif
 
 /** The current ICU patchlevel version as an integer.  
  *  This value will change in the subsequent releases of ICU
@@ -87,20 +91,32 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
+#if DEPLOYMENT_TARGET_MACOSX
+#define U_ICU_VERSION_SUFFIX _3_2
+#else
 #define U_ICU_VERSION_SUFFIX _3_6
+#endif
 
 /** The current ICU library version as a dotted-decimal string. The patchlevel
  *  only appears in this string if it non-zero. 
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
+#if DEPLOYMENT_TARGET_MACOSX
+#define U_ICU_VERSION "3.2"
+#else
 #define U_ICU_VERSION "3.6"
+#endif
 
 /** The current ICU library major/minor version as a string without dots, for library name suffixes. 
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
+#if DEPLOYMENT_TARGET_MACOSX
+#define U_ICU_VERSION_SHORT "32"
+#else
 #define U_ICU_VERSION_SHORT "36"
+#endif
 
 /** An ICU version consists of up to 4 numbers from 0..255.
  *  @stable ICU 2.4
@@ -127,7 +143,11 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
 #       define U_ICU_NAMESPACE icu
         namespace U_ICU_NAMESPACE { }
 #   else
+#if DEPLOYMENT_TARGET_MACOSX
+#define U_ICU_NAMESPACE icu_3_2
+#else
 #define U_ICU_NAMESPACE icu_3_6
+#endif
         namespace U_ICU_NAMESPACE { }
         namespace icu = U_ICU_NAMESPACE;
 #   endif
@@ -205,7 +225,11 @@ u_getVersion(UVersionInfo versionArray);
  * This value may change in the subsequent releases of ICU
  * @stable ICU 2.4
  */
+#if DEPLOYMENT_TARGET_MACOSX
+#define UCOL_RUNTIME_VERSION 5
+#else
 #define UCOL_RUNTIME_VERSION 6
+#endif
 
 /** Builder code version. When this is different, same tailoring might result
  * in assigning different collation elements to code points                  
@@ -219,7 +243,11 @@ u_getVersion(UVersionInfo versionArray);
  * This value may change in the subsequent releases of ICU
  * @stable ICU 2.4
  */
+#if DEPLOYMENT_TARGET_MACOSX
+#define UCOL_BUILDER_VERSION 6
+#else
 #define UCOL_BUILDER_VERSION 7
+#endif
 
 /** *** Removed *** Instead we use the data we read from FractionalUCA.txt
  * This is the version of FractionalUCA.txt tailoring rules