| OLD | NEW |
| 1 Index: source/common/unicode/ptypes.h | 1 Index: source/common/unicode/ptypes.h |
| 2 =================================================================== | 2 =================================================================== |
| 3 --- source/common/unicode/ptypes.h (revision 68397) | 3 --- source/common/unicode/ptypes.h (revision 68397) |
| 4 +++ source/common/unicode/ptypes.h (working copy) | 4 +++ source/common/unicode/ptypes.h (working copy) |
| 5 @@ -22,7 +22,15 @@ | 5 @@ -22,7 +22,17 @@ |
| 6 | 6 |
| 7 #include <sys/types.h> | 7 #include <sys/types.h> |
| 8 | 8 |
| 9 -#include "unicode/platform.h" | 9 -#include "unicode/platform.h" |
| 10 +#if defined(__APPLE__) | 10 +#if defined(__APPLE__) |
| 11 +# include "unicode/pmac.h" | 11 +# include "unicode/pmac.h" |
| 12 +#elif defined(ANDROID) | 12 +#elif defined(ANDROID) |
| 13 +# include "unicode/pandroid.h" | 13 +# include "unicode/pandroid.h" |
| 14 +#elif defined(__native_client__) |
| 15 +# include "unicode/pnacl.h" |
| 14 +#elif defined(__linux__) | 16 +#elif defined(__linux__) |
| 15 +# include "unicode/plinux.h" | 17 +# include "unicode/plinux.h" |
| 16 +#else | 18 +#else |
| 17 +# include "unicode/platform.h" | 19 +# include "unicode/platform.h" |
| 18 +#endif | 20 +#endif |
| 19 | 21 |
| 20 /*===========================================================================*/ | 22 /*===========================================================================*/ |
| 21 /* Generic data types */ | 23 /* Generic data types */ |
| 22 Index: source/common/unicode/platform.h.in | 24 Index: source/common/unicode/platform.h.in |
| 23 =================================================================== | 25 =================================================================== |
| (...skipping 12 matching lines...) Expand all Loading... |
| 36 /** @{ Symbol import-export control
*/ | 38 /** @{ Symbol import-export control
*/ |
| 37 /*===========================================================================*/ | 39 /*===========================================================================*/ |
| 38 | 40 |
| 39 -#if @U_USE_GCC_VISIBILITY_ATTRIBUTE@ | 41 -#if @U_USE_GCC_VISIBILITY_ATTRIBUTE@ |
| 40 +#ifdef U_STATIC_IMPLEMENTATION | 42 +#ifdef U_STATIC_IMPLEMENTATION |
| 41 +#define U_EXPORT | 43 +#define U_EXPORT |
| 42 +#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@ | 44 +#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@ |
| 43 #define U_EXPORT __attribute__((visibility("default"))) | 45 #define U_EXPORT __attribute__((visibility("default"))) |
| 44 #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ | 46 #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ |
| 45 || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) | 47 || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) |
| OLD | NEW |