---- 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 @@
+--- ./common/unicode/uconfig.h 2017-04-18 11:33:51.000000000 -0700
++++ ./common/unicode/uconfig.h 2017-04-30 10:35:22.000000000 -0700
+@@ -89,7 +89,7 @@
* @internal
*/
#ifndef U_DISABLE_RENAMING
#endif
/**
-@@ -401,7 +401,7 @@
+@@ -415,7 +415,7 @@
* @stable ICU 3.2
*/
#ifndef UCONFIG_NO_SERVICE
+# define UCONFIG_NO_SERVICE 1
#endif
- #endif
---- icuSources/common/unicode/utypes.h 2011-12-12 12:17:54.000000000 -0800
-+++ build/common/unicode/utypes.h 2011-12-15 22:23:21.000000000 -0800
-@@ -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 */
-
/**
+--- ./common/unicode/utypes.h 2017-04-27 17:14:50.000000000 -0700
++++ ./common/unicode/utypes.h 2017-04-30 10:36:14.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