---- icuSources/common/unicode/uconfig.h 2008-07-12 23:14:49.000000000 -0700
-+++ build/common/unicode/uconfig.h 2008-07-24 12:52:05.000000000 -0700
-@@ -222,7 +222,7 @@
+--- ./common/unicode/uconfig.h 2018-06-10 16:06:23.000000000 -0700
++++ ./common/unicode/uconfig.h 2018-06-11 22:27:39.000000000 -0700
+@@ -89,7 +89,7 @@
+ * @internal
+ */
+ #ifndef U_DISABLE_RENAMING
+-#define U_DISABLE_RENAMING 0
++#define U_DISABLE_RENAMING 1
+ #endif
+
+ /**
+@@ -418,7 +418,7 @@
* @stable ICU 3.2
*/
#ifndef UCONFIG_NO_SERVICE
+# define UCONFIG_NO_SERVICE 1
#endif
- #endif
---- icuSources/common/unicode/udata.h 2008-07-12 23:14:49.000000000 -0700
-+++ build/common/unicode/udata.h 2008-07-24 12:52:05.000000000 -0700
-@@ -367,7 +367,7 @@
- /** ICU does not access the file system for data loading. */
- UDATA_NO_FILES,
- /** An alias for the default access mode. */
+ /**
+--- ./common/unicode/udata.h 2018-06-10 16:06:23.000000000 -0700
++++ ./common/unicode/udata.h 2018-06-11 22:37:06.000000000 -0700
+@@ -401,10 +401,10 @@
+ typedef enum UDataFileAccess {
+ /** ICU looks for data in single files first, then in packages. (default) @stable ICU 3.4 */
+ UDATA_FILES_FIRST,
+- /** An alias for the default access mode. @stable ICU 3.4 */
- UDATA_DEFAULT_ACCESS = UDATA_FILES_FIRST,
+ /** ICU only loads data from packages, not from single files. @stable ICU 3.4 */
+ UDATA_ONLY_PACKAGES,
++ /** An alias for the default access mode. @stable ICU 3.4 */
+ UDATA_DEFAULT_ACCESS = UDATA_ONLY_PACKAGES,
- UDATA_FILE_ACCESS_COUNT
- } UDataFileAccess;
-
+ /** ICU loads data from packages first, and only from single files
+ if the data cannot be found in a package. @stable ICU 3.4 */
+ UDATA_PACKAGES_FIRST,
+--- ./common/unicode/utypes.h 2018-06-10 16:54:07.000000000 -0700
++++ ./common/unicode/utypes.h 2018-06-11 22:30:05.000000000 -0700
+@@ -63,7 +63,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