1 Index: source/common/unicode/ptypes.h 2 =================================================================== 3 --- source/common/unicode/ptypes.h (revision 68397) 4 +++ source/common/unicode/ptypes.h (working copy) 5 @@ -22,7 +22,17 @@ 6 7 #include <sys/types.h> 8 9 -#include "unicode/platform.h" 10 +#if defined(__APPLE__) 11 +# include "unicode/pmac.h" 12 +#elif defined(ANDROID) 13 +# include "unicode/pandroid.h" 14 +#elif defined(__native_client__) 15 +# include "unicode/pnacl.h" 16 +#elif defined(__linux__) 17 +# include "unicode/plinux.h" 18 +#else 19 +# include "unicode/platform.h" 20 +#endif 21 22 /*===========================================================================*/ 23 /* Generic data types */ 24 Index: source/common/unicode/platform.h.in 25 =================================================================== 26 --- source/common/unicode/platform.h.in (revision 29054) 27 +++ source/common/unicode/platform.h.in (working copy) 28 @@ -1,7 +1,7 @@ 29 /* 30 ****************************************************************************** 31 * 32 -* Copyright (C) 1997-2010, International Business Machines 33 +* Copyright (C) 1997-2011, International Business Machines 34 * Corporation and others. All Rights Reserved. 35 * 36 ****************************************************************************** 37 @@ -298,7 +298,9 @@ 38 /** @{ Symbol import-export control */ 39 /*===========================================================================*/ 40 41 -#if @U_USE_GCC_VISIBILITY_ATTRIBUTE@ 42 +#ifdef U_STATIC_IMPLEMENTATION 43 +#define U_EXPORT 44 +#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@ 45 #define U_EXPORT __attribute__((visibility("default"))) 46 #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ 47 || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) 48
