ICU-57165.0.1.tar.gz

[apple/icu.git] / minimalpatchconfig.txt

diff --git a/minimalpatchconfig.txt b/minimalpatchconfig.txt
index 2d72bf236899b34171d18f7a27528c14b144b2a6..df538bb9bffc54c874571bd00e6e2c912e32e524 100644 (file)
--- a/minimalpatchconfig.txt
+++ b/minimalpatchconfig.txt
@@ -1,6 +1,15 @@
---- icuSources/common/unicode/uconfig.h        2009-09-15 17:06:26.000000000 -0700
-+++ build/common/unicode/uconfig.h     2009-12-01 23:31:20.000000000 -0800
-@@ -225,7 +225,7 @@
+--- ./common/unicode/uconfig.h 2016-03-19 21:18:39.000000000 -0700
++++ ./common/unicode/uconfig.h 2016-03-29 15:23:56.000000000 -0700
+@@ -87,7 +87,7 @@
+  * @internal
+  */
+ #ifndef U_DISABLE_RENAMING
+-#define U_DISABLE_RENAMING 0
++#define U_DISABLE_RENAMING 1
+ #endif
+ 
+ /**
+@@ -413,7 +413,7 @@

   * @stable ICU 3.2
   */
  #ifndef UCONFIG_NO_SERVICE
   * @stable ICU 3.2
   */
  #ifndef UCONFIG_NO_SERVICE


@@ -8,35 +17,30 @@
 +#   define UCONFIG_NO_SERVICE 1
  #endif
  
 +#   define UCONFIG_NO_SERVICE 1
  #endif
  

- #endif
---- icuSources/common/unicode/udata.h  2010-03-10 16:47:27.000000000 -0800
-+++ build/common/unicode/udata.h       2010-04-21 15:11:11.000000000 -0700
-@@ -393,7 +393,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   2016-03-10 15:38:06.000000000 -0800
++++ ./common/unicode/udata.h   2016-03-29 15:23:07.000000000 -0700
+@@ -399,10 +399,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,
 -    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_DEFAULT_ACCESS = UDATA_ONLY_PACKAGES,

-     UDATA_FILE_ACCESS_COUNT
- } UDataFileAccess;
- 
---- icuSources/common/unicode/utypes.h 2010-03-11 20:47:35.000000000 -0800
-+++ build/common/unicode/utypes.h      2010-04-21 15:02:44.000000000 -0700
-@@ -55,7 +55,7 @@
+     /** 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  2016-04-20 14:47:56.000000000 -0700
++++ ./common/unicode/utypes.h  2016-04-20 14:52:41.000000000 -0700
+@@ -61,7 +61,7 @@

   */
   */

- #ifdef XP_CPLUSPLUS
+ #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
  #   ifndef U_SHOW_CPLUSPLUS_API
 -#       define U_SHOW_CPLUSPLUS_API 1
 +#       define U_SHOW_CPLUSPLUS_API 0
  #   endif
  #else
  #   undef U_SHOW_CPLUSPLUS_API

-@@ -234,7 +234,7 @@
-  */
- #define U_ICUDATA_NAME    "icudt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER  /**< @internal */
- #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 */
- 
- /**
-  *  U_ICU_ENTRY_POINT is the name of the DLL entry point to the ICU data library.