patches/putil.patch - Issue 822213003: ICU upgrade to 54.1 step 2

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/putil.patch

Issue 822213003: ICU upgrade to 54.1 step 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master

Patch Set: readme: better wrapping, declspec patch dropped Created 5 years, 11 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:

OLD	NEW
	(Empty)
1 Index: source/common/putilimp.h

2 ===================================================================

3 --- source/common/putilimp.h (revision 259715)

4 +++ source/common/putilimp.h (working copy)

5 @@ -85,7 +85,7 @@

6

7 #ifdef U_HAVE_NL_LANGINFO_CODESET

8 /* Use the predefined value. */

9 -#elif U_PLATFORM_HAS_WIN32_API

10 +#elif U_PLATFORM_HAS_WIN32_API \|\| U_PLATFORM == U_PF_ANDROID \|\| U_PLATFORM == U _PF_QNX

11 # define U_HAVE_NL_LANGINFO_CODESET 0

12 #else

13 # define U_HAVE_NL_LANGINFO_CODESET 1

14 @@ -116,9 +116,12 @@

15 #elif U_PLATFORM == U_PF_ANDROID

16 # define U_TIMEZONE timezone

17 #elif U_PLATFORM_IS_LINUX_BASED

18 -# if !defined(__UCLIBC__)

19 - /* __timezone is only available in glibc */

20 -# define U_TIMEZONE __timezone

21 +# if defined(__UCLIBC__)

22 + /* uClibc does not have __timezone or _timezone. */

23 +# elif defined(_NEWLIB_VERSION)

24 +# define U_TIMEZONE _timezone

25 +# elif defined(__GLIBC__)

26 +# define U_TIMEZONE __timezone

27 # endif

28 #elif U_PLATFORM_USES_ONLY_WIN32_API

29 # define U_TIMEZONE _timezone

OLD	NEW

« no previous file with comments | « patches/platform_nacl.patch ('k') | patches/regex.patch » ('j') | no next file with comments »