ICU upgrade to 54.1 step 2

patches/vscomp.patch

Index: patches/vscomp.patch
diff --git a/patches/vscomp.patch b/patches/vscomp.patch
index 9a280a4bb2a1c06ffd0c75b17843476eec6bcbd1..ff62779ad661584021752d44440671e9c6ee26f7 100644
--- a/patches/vscomp.patch
+++ b/patches/vscomp.patch
@@ -1,7 +1,7 @@
-Index: source/common/locmap.c
-===================================================================
---- source/common/locmap.c	(revision 259715)
-+++ source/common/locmap.c	(working copy)
+diff --git a/source/common/locmap.c b/source/common/locmap.c
+index 59809c6..927041b 100644
+--- a/source/common/locmap.c
++++ b/source/common/locmap.c
 @@ -29,6 +29,7 @@
  #include "cstring.h"
  #include "cmemory.h"
@@ -18,11 +18,11 @@ Index: source/common/locmap.c
  
  #ifdef USE_WINDOWS_LOCALE_API
  #include <windows.h>
-Index: source/common/stringpiece.cpp
-===================================================================
---- source/common/stringpiece.cpp	(revision 259715)
-+++ source/common/stringpiece.cpp	(working copy)
-@@ -68,6 +68,14 @@
+diff --git a/source/common/stringpiece.cpp b/source/common/stringpiece.cpp
+index 0fb2b3e..007713e 100644
+--- a/source/common/stringpiece.cpp
++++ b/source/common/stringpiece.cpp
+@@ -68,6 +68,14 @@ operator==(const StringPiece& x, const StringPiece& y) {
  }
  
  
@@ -37,29 +37,3 @@ Index: source/common/stringpiece.cpp
 +#endif
  
  U_NAMESPACE_END
-Index: source/common/umutex.h
-===================================================================
---- source/common/umutex.h	(revision 266014)
-+++ source/common/umutex.h	(working copy)
-@@ -320,7 +320,7 @@
- 
- 
- typedef struct UMutex {
--    UInitOnce         fInitOnce;
-+    icu::UInitOnce         fInitOnce;
-     CRITICAL_SECTION  fCS;
- } UMutex;
- 
-Index: source/common/wintz.c
-===================================================================
---- source/common/wintz.c	(revision 266014)
-+++ source/common/wintz.c	(working copy)
-@@ -285,7 +285,7 @@
-     tmpid[0] = 0;
- 
-     id = GetUserGeoID(GEOCLASS_NATION);
--    errorCode = GetGeoInfo(id,GEO_ISO2,ISOcode,3,0);
-+    errorCode = GetGeoInfoA(id,GEO_ISO2,ISOcode,3,0);
- 
-     bundle = ures_openDirect(NULL, "windowsZones", &status);
-     ures_getByKey(bundle, "mapTimezones", bundle, &status);