patches/vscomp.patch - Issue 1646623006: Fix compilation errors on Android and Windows

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/vscomp.patch

Issue 1646623006: Fix compilation errors on Android and Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master

Patch Set: Created 4 years, 10 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

OLD	NEW
1 diff --git a/source/common/locmap.c b/source/common/locmap.c	1 diff --git a/source/common/locmap.c b/source/common/locmap.c

2 index c746ce3..224a2b1 100644	2 index c746ce3..224a2b1 100644

3 --- a/source/common/locmap.c	3 --- a/source/common/locmap.c

4 +++ b/source/common/locmap.c	4 +++ b/source/common/locmap.c

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 Loading...
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 diff --git a/source/i18n/dtfmtsym.cpp b/source/i18n/dtfmtsym.cpp

	41 index e99670d..c9a3502 100644

	42 --- a/source/i18n/dtfmtsym.cpp

	43 +++ b/source/i18n/dtfmtsym.cpp

	44 @@ -169,7 +169,7 @@ SharedDateFormatSymbols::~SharedDateFormatSymbols() {

	45 template<> U_I18N_API

	46 const SharedDateFormatSymbols *

	47 LocaleCacheKey<SharedDateFormatSymbols>::createObject(

	48 - const void /unusedContext*/, UErrorCode &status) const {

	49 + const void * /unusedContext/, UErrorCode &status) const {

	50 char type[256];

	51 Calendar::getCalendarTypeFromLocale(fLoc, type, UPRV_LENGTHOF(type), status );

	52 if (U_FAILURE(status)) {

OLD	NEW

« no previous file with comments | « icu.gyp ('k') | source/i18n/dtfmtsym.cpp » ('j') | no next file with comments »