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

Side by Side Diff: icu52/patches/putil.patch

Issue 224943002: icu local change part1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: function indentation changed Created 6 years, 8 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
« no previous file with comments | « icu52/patches/pnacl.h.patch ('k') | icu52/patches/regex.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Index: source/common/unicode/ptypes.h 1 Index: source/common/putilimp.h
2 =================================================================== 2 ===================================================================
3 --- source/common/unicode/ptypes.h» (revision 68397) 3 --- source/common/putilimp.h» (revision 259715)
4 +++ source/common/unicode/ptypes.h» (working copy) 4 +++ source/common/putilimp.h» (working copy)
5 @@ -22,7 +22,15 @@ 5 @@ -85,7 +85,7 @@
6 6
7 #include <sys/types.h> 7 #ifdef U_HAVE_NL_LANGINFO_CODESET
8 8 /* Use the predefined value. */
9 -#include "unicode/platform.h" 9 -#elif U_PLATFORM_HAS_WIN32_API
10 +#if defined(__APPLE__) 10 +#elif U_PLATFORM_HAS_WIN32_API || U_PLATFORM == U_PF_ANDROID || U_PLATFORM == U _PF_QNX
11 +# include "unicode/pmac.h" 11 # define U_HAVE_NL_LANGINFO_CODESET 0
12 +#elif defined(ANDROID) 12 #else
13 +# include "unicode/pandroid.h" 13 # define U_HAVE_NL_LANGINFO_CODESET 1
14 +#elif defined(__linux__)
15 +# include "unicode/plinux.h"
16 +#else
17 +# include "unicode/platform.h"
18 +#endif
19
20 /*===========================================================================*/
21 /* Generic data types */
22 Index: source/common/unicode/platform.h.in
23 ===================================================================
24 --- source/common/unicode/platform.h.in»(revision 29054)
25 +++ source/common/unicode/platform.h.in»(working copy)
26 @@ -1,7 +1,7 @@
27 /*
28 ******************************************************************************
29 *
30 -* Copyright (C) 1997-2010, International Business Machines
31 +* Copyright (C) 1997-2011, International Business Machines
32 * Corporation and others. All Rights Reserved.
33 *
34 ******************************************************************************
35 @@ -298,7 +298,9 @@
36 /** @{ Symbol import-export control */
37 /*===========================================================================*/
38
39 -#if @U_USE_GCC_VISIBILITY_ATTRIBUTE@
40 +#ifdef U_STATIC_IMPLEMENTATION
41 +#define U_EXPORT
42 +#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@
43 #define U_EXPORT __attribute__((visibility("default")))
44 #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \
45 || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550)
OLDNEW
« no previous file with comments | « icu52/patches/pnacl.h.patch ('k') | icu52/patches/regex.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698