Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(761)

Side by Side Diff: patches/vscomp.patch

Issue 256183002: Fix two more compile errros on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu52/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 Index: source/common/locmap.c 1 Index: source/common/locmap.c
2 =================================================================== 2 ===================================================================
3 --- source/common/locmap.c (revision 259715) 3 --- source/common/locmap.c (revision 259715)
4 +++ source/common/locmap.c (working copy) 4 +++ source/common/locmap.c (working copy)
5 @@ -29,6 +29,7 @@ 5 @@ -29,6 +29,7 @@
6 #include "cstring.h" 6 #include "cstring.h"
7 #include "cmemory.h" 7 #include "cmemory.h"
8 8
9 +#if 0 9 +#if 0
10 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500) 10 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500)
(...skipping 19 matching lines...) Expand all
30 + * static const class variable. However, the C++ standard states that 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. 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). 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. 33 + * Cygwin with MSVC 9.0 also complains here about redefinition.
34 + */ 34 + */
35 +#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC) 35 +#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC)
36 const int32_t StringPiece::npos = 0x7fffffff; 36 const int32_t StringPiece::npos = 0x7fffffff;
37 +#endif 37 +#endif
38 38
39 U_NAMESPACE_END 39 U_NAMESPACE_END
40 Index: 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
53 Index: 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);
OLDNEW
« README.chromium ('K') | « README.chromium ('k') | source/common/umutex.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698