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,15 @@ 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(__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) 46
