1Index: source/common/locmap.c
2===================================================================
3--- source/common/locmap.c	(revision 259715)
4+++ source/common/locmap.c	(working copy)
5@@ -29,6 +29,7 @@
6 #include "cstring.h"
7 #include "cmemory.h"
8 
9+#if 0
10 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500)
11 /*
12  * TODO: It seems like we should widen this to
13@@ -40,6 +41,7 @@
14  */
15 #define USE_WINDOWS_LOCALE_API
16 #endif
17+#endif
18 
19 #ifdef USE_WINDOWS_LOCALE_API
20 #include <windows.h>
21Index: source/common/stringpiece.cpp
22===================================================================
23--- source/common/stringpiece.cpp	(revision 259715)
24+++ source/common/stringpiece.cpp	(working copy)
25@@ -68,6 +68,14 @@
26 }
27 
28 
29+/* Microsoft Visual Studio (even 2013) complains about redefinition of this
30+ * static const class variable. However, the C++ standard states that this
31+ * definition is correct. Perhaps there is a bug in the Microsoft compiler.
32+ * This is not an issue on any other compilers (that we know of).
33+ * Cygwin with MSVC 9.0 also complains here about redefinition.
34+ */
35+#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC)
36 const int32_t StringPiece::npos = 0x7fffffff;
37+#endif
38 
39 U_NAMESPACE_END
40Index: source/common/umutex.h
41===================================================================
42--- source/common/umutex.h	(revision 266014)
43+++ source/common/umutex.h	(working copy)
44@@ -320,7 +320,7 @@
45 
46 
47 typedef struct UMutex {
48-    UInitOnce         fInitOnce;
49+    icu::UInitOnce         fInitOnce;
50     CRITICAL_SECTION  fCS;
51 } UMutex;
52 
53Index: source/common/wintz.c
54===================================================================
55--- source/common/wintz.c	(revision 266014)
56+++ source/common/wintz.c	(working copy)
57@@ -285,7 +285,7 @@
58     tmpid[0] = 0;
59 
60     id = GetUserGeoID(GEOCLASS_NATION);
61-    errorCode = GetGeoInfo(id,GEO_ISO2,ISOcode,3,0);
62+    errorCode = GetGeoInfoA(id,GEO_ISO2,ISOcode,3,0);
63 
64     bundle = ures_openDirect(NULL, "windowsZones", &status);
65     ures_getByKey(bundle, "mapTimezones", bundle, &status);
66