---- icuSources/common/unicode/uconfig.h 2005-08-11 17:40:22.000000000 -0700
-+++ build/common/unicode/uconfig.h 2005-09-15 16:58:56.000000000 -0700
-@@ -180,7 +180,7 @@
- * @draft ICU 3.2
+--- icuSources/common/unicode/uconfig.h 2011-12-11 21:21:47.000000000 -0800
++++ build/common/unicode/uconfig.h 2011-12-15 22:22:52.000000000 -0800
+@@ -106,7 +106,7 @@
+ * @internal
+ */
+ #ifndef U_DISABLE_RENAMING
+-#define U_DISABLE_RENAMING 0
++#define U_DISABLE_RENAMING 1
+ #endif
+
+ /**
+@@ -401,7 +401,7 @@
+ * @stable ICU 3.2
*/
#ifndef UCONFIG_NO_SERVICE
-# define UCONFIG_NO_SERVICE 0
#endif
#endif
+--- icuSources/common/unicode/udata.h 2010-11-23 14:49:28.000000000 -0800
++++ build/common/unicode/udata.h 2011-12-15 22:31:10.000000000 -0800
+@@ -393,7 +393,7 @@
+ /** ICU does not access the file system for data loading. */
+ UDATA_NO_FILES,
+ /** An alias for the default access mode. */
+- UDATA_DEFAULT_ACCESS = UDATA_FILES_FIRST,
++ UDATA_DEFAULT_ACCESS = UDATA_ONLY_PACKAGES,
+ UDATA_FILE_ACCESS_COUNT
+ } UDataFileAccess;
+
+--- icuSources/common/unicode/utypes.h 2011-12-12 12:17:54.000000000 -0800
++++ build/common/unicode/utypes.h 2011-12-15 22:30:43.000000000 -0800
+@@ -59,7 +59,7 @@
+ */
+ #ifdef __cplusplus
+ # ifndef U_SHOW_CPLUSPLUS_API
+-# define U_SHOW_CPLUSPLUS_API 1
++# define U_SHOW_CPLUSPLUS_API 0
+ # endif
+ #else
+ # undef U_SHOW_CPLUSPLUS_API
+@@ -137,7 +137,7 @@
+ #define U_ICUDATA_NAME "icudt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER
+ #ifndef U_HIDE_INTERNAL_API
+ #define U_USRDATA_NAME "usrdt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER /**< @internal */
+-#define U_USE_USRDATA 1 /**< @internal */
++#define U_USE_USRDATA 0 /**< @internal */
+ #endif /* U_HIDE_INTERNAL_API */
+
+ /**