third_party/icu/patches/pmac.h.patch - Issue 6578003: Add back U_WCHAR_IS_UTF32 macro to pmac.h...

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: third_party/icu/patches/pmac.h.patch

Issue 6578003: Add back U_WCHAR_IS_UTF32 macro to pmac.h... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 9 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 | Annotate | Revision Log

OLD	NEW
1 Index: common/unicode/pmac.h	1 --- common/unicode/pmac.h

2 ===================================================================	2 +++ common/unicode/pmac.h

3 --- common/unicode/pmac.h» (revision 69841)

4 +++ common/unicode/pmac.h» (working copy)

5 @@ -49,14 +49,20 @@	3 @@ -49,14 +49,20 @@

6 #define U_DARWIN	4 #define U_DARWIN

7 #endif	5 #endif

8	6

9 +#include <AvailabilityMacros.h>	7 +#include <AvailabilityMacros.h>

10 +	8 +

11 /**	9 /**

12 * \def U_HAVE_DIRENT_H	10 * \def U_HAVE_DIRENT_H

13 * Define whether dirent.h is available	11 * Define whether dirent.h is available

14 * @internal	12 * @internal

(...skipping 14 matching lines...) Expand all Loading...
29 #endif	27 #endif

30 -#if 1	28 -#if 1

31 -#define U_TIMEZONE timezone	29 -#define U_TIMEZONE timezone

32 +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5	30 +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5

33 +#define U_TIMEZONE 0	31 +#define U_TIMEZONE 0

34 +#else	32 +#else

35 +#define U_TIMEZONE timezone	33 +#define U_TIMEZONE timezone

36 #endif	34 #endif

37 #if 1	35 #if 1

38 #define U_TZNAME tzname	36 #define U_TZNAME tzname

	37 @@ -399,4 +407,18 @@

	38

	39 # endif

	40 #endif

	41 +

	42 +/===========================================================================/

	43 +/* Local defines */

	44 +/===========================================================================/

	45 +

	46 +/* On the Mac, we define U_WCHAR_IS_UTF32 to treat wchar_t as though it

	47 + contains UTF-32 at all times. Strictly speaking, that's not entirely

	48 + correct given Mac's libc (__STDC_ISO_10646__ is not defined) , but provided

	49 + that we ignore libc's locale support (by not calling setlocale) and its

	50 + multibyte string support, this should be fine. Our codebase makes enough

	51 + other assumptions about a UTF-8 locale and UTF-32 wchar_t strings for this

	52 + to make sense. */

	53 +#define U_WCHAR_IS_UTF32

	54 +

	55 #endif

OLD	NEW

« no previous file with comments | « no previous file | third_party/icu/public/common/unicode/pmac.h » ('j') | no next file with comments »