summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 11:35:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 11:35:38 +0000
commit432d51af8c3f6760dc1dda1f229f9a27e34d4a44 (patch)
tree93f7f6bd1428cc1674d16d8c2188dc18f03b8781
parent76b55956ae3d8decfc46202c9252ec4aa6b19102 (diff)
ICU: Reduce TL vs W32TeX diffs
git-svn-id: svn://tug.org/texlive/trunk@30902 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/icu/icu-51.1-PATCHES/patch-04-Windows20004
-rw-r--r--Build/source/libs/icu/icu-51.1/source/common/wintz.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/libs/icu/icu-51.1-PATCHES/patch-04-Windows2000 b/Build/source/libs/icu/icu-51.1-PATCHES/patch-04-Windows2000
index 9431330c92e..7120f41b1df 100644
--- a/Build/source/libs/icu/icu-51.1-PATCHES/patch-04-Windows2000
+++ b/Build/source/libs/icu/icu-51.1-PATCHES/patch-04-Windows2000
@@ -50,9 +50,9 @@ diff -ur -x config.guess -x config.sub -x install-sh icu-51.1.orig/source/common
+ } else {
+ pgetusergeoid = GetProcAddress (hi, "GetUserGeoID");
+ pgetgeoinfo = GetProcAddress (hi, "GetGeoInfoA");
++ if (!pgetusergeoid || !pgetgeoinfo)
++ NewerThanWindows2000 = 0;
+ }
-+ if (!pgetusergeoid || !pgetgeoinfo)
-+ NewerThanWindows2000 = 0;
+ if (NewerThanWindows2000 == 1) {
+ id = (int)pgetusergeoid (GEOCLASS_NATION);
diff --git a/Build/source/libs/icu/icu-51.1/source/common/wintz.c b/Build/source/libs/icu/icu-51.1/source/common/wintz.c
index 6c0435dd969..f659053389e 100644
--- a/Build/source/libs/icu/icu-51.1/source/common/wintz.c
+++ b/Build/source/libs/icu/icu-51.1/source/common/wintz.c
@@ -321,9 +321,9 @@ uprv_detectWindowsTimeZone() {
} else {
pgetusergeoid = GetProcAddress (hi, "GetUserGeoID");
pgetgeoinfo = GetProcAddress (hi, "GetGeoInfoA");
+ if (!pgetusergeoid || !pgetgeoinfo)
+ NewerThanWindows2000 = 0;
}
- if (!pgetusergeoid || !pgetgeoinfo)
- NewerThanWindows2000 = 0;
if (NewerThanWindows2000 == 1) {
id = (int)pgetusergeoid (GEOCLASS_NATION);