OLD | NEW |
1 diff --git a/source/common/unicode/pandroid.h b/source/common/unicode/pqnx.h | 1 --- source/common/unicode/pqnx.h» 2014-01-23 14:52:38.889798542 -0800 |
2 --- a/source/common/unicode/pandroid.h | 2 +++ source/common/unicode/pqnx.h» 2014-03-18 11:24:27.335797876 -0700 |
3 +++ b/source/common/unicode/pqnx.h | 3 @@ -24,8 +24,8 @@ |
4 @@ -45,8 +45,8 @@ | 4 #define _PLATFORM_H |
| 5 |
| 6 /** |
| 7 - * \file |
| 8 - * \brief Basic types for the platform |
| 9 + * \file |
| 10 + * \brief Basic types for the platform |
| 11 */ |
| 12 |
| 13 /* This file should be included before uvernum.h. */ |
| 14 @@ -34,7 +34,7 @@ |
| 15 #endif |
| 16 |
| 17 /** |
| 18 - * Determine wheter to enable auto cleanup of libraries. |
| 19 + * Determine wheter to enable auto cleanup of libraries. |
| 20 * @internal |
| 21 */ |
| 22 #ifndef UCLN_NO_AUTO_CLEANUP |
| 23 @@ -45,13 +45,13 @@ |
5 #ifndef CYGWINMSVC | 24 #ifndef CYGWINMSVC |
6 | 25 |
7 /** Define the platform we're on. */ | 26 /** Define the platform we're on. */ |
8 -#ifndef U_LINUX | 27 -#ifndef U_LINUX |
9 -#define U_LINUX | 28 -#define U_LINUX |
10 +#ifndef U_QNX | 29 +#ifndef U_QNX |
11 +#define U_QNX | 30 +#define U_QNX |
12 #endif | 31 #endif |
13 | 32 |
14 /** | 33 /** |
15 @@ -331,7 +331,7 @@ | 34 * \def U_HAVE_DIRENT_H |
16 # ifdef __cplusplus | 35 - * Define whether dirent.h is available |
17 # define U_INLINE inline | 36 + * Define whether dirent.h is available |
18 # else | 37 * @internal |
19 -# define U_INLINE inline | 38 */ |
20 +# define U_INLINE __inline__ | 39 #ifndef U_HAVE_DIRENT_H |
21 # endif | 40 @@ -147,7 +147,7 @@ |
22 #endif | 41 #endif |
23 | 42 |
24 diff --git a/source/common/unicode/ptypes.h b/source/common/unicode/ptypes.h | 43 /* 1 or 0 to enable or disable threads. If undefined, default is: enable threa
ds. */ |
25 --- a/source/common/unicode/ptypes.h | 44 -#ifndef ICU_USE_THREADS |
26 +++ b/source/common/unicode/ptypes.h | 45 +#ifndef ICU_USE_THREADS |
27 @@ -34,6 +34,8 @@ | 46 #define ICU_USE_THREADS 1 |
28 # include "unicode/pfreebsd.h" | 47 #endif |
29 #elif defined(__OpenBSD__) | 48 |
30 # include "unicode/popenbsd.h" | 49 @@ -272,7 +272,7 @@ |
31 +#elif defined(__QNXNTO__) | 50 /*===========================================================================*/ |
32 +# include "unicode/pqnx.h" | 51 |
| 52 #ifndef U_HAVE_NL_LANGINFO_CODESET |
| 53 -#define U_HAVE_NL_LANGINFO_CODESET 1 |
| 54 +#define U_HAVE_NL_LANGINFO_CODESET 0 |
| 55 #endif |
| 56 |
| 57 #ifndef U_NL_LANGINFO_CODESET |
| 58 @@ -282,8 +282,8 @@ |
| 59 #if 1 |
| 60 #define U_TZSET tzset |
| 61 #endif |
| 62 -#if !defined(__UCLIBC__) |
| 63 -#define U_TIMEZONE __timezone |
| 64 +#if 1 |
| 65 +#define U_TIMEZONE timezone |
| 66 #endif |
| 67 #if 1 |
| 68 #define U_TZNAME tzname |
| 69 @@ -303,7 +303,7 @@ |
| 70 #elif 1 |
| 71 #define U_EXPORT __attribute__((visibility("default"))) |
| 72 #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ |
| 73 - || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) |
| 74 + || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) |
| 75 #define U_EXPORT __global |
| 76 /*#elif defined(__HP_aCC) || defined(__HP_cc) |
| 77 #define U_EXPORT __declspec(dllexport)*/ |
| 78 @@ -318,7 +318,7 @@ |
| 79 #if defined(U_CYGWIN) && !defined(__GNUC__) |
| 80 #define U_IMPORT __declspec(dllimport) |
33 #else | 81 #else |
34 # include "unicode/platform.h" | 82 -#define U_IMPORT |
| 83 +#define U_IMPORT |
35 #endif | 84 #endif |
| 85 |
| 86 /* @} */ |
| 87 @@ -336,7 +336,7 @@ |
| 88 #endif |
| 89 |
| 90 #ifndef U_ALIGN_CODE |
| 91 -#define U_ALIGN_CODE(n) |
| 92 +#define U_ALIGN_CODE(n) |
| 93 #endif |
| 94 |
| 95 /** @} */ |
| 96 @@ -379,7 +379,7 @@ |
| 97 * Define the library suffix with C syntax. |
| 98 * @internal |
| 99 */ |
| 100 -# define U_LIB_SUFFIX_C_NAME |
| 101 +# define U_LIB_SUFFIX_C_NAME |
| 102 /** |
| 103 * Define the library suffix as a string with C syntax |
| 104 * @internal |
| 105 @@ -394,7 +394,7 @@ |
| 106 #if U_HAVE_LIB_SUFFIX |
| 107 # ifndef U_ICU_ENTRY_POINT_RENAME |
| 108 /* Renaming pattern: u_strcpy_41_suffix */ |
| 109 -# define U_ICU_ENTRY_POINT_RENAME(x) x ## _ ## 46 ## |
| 110 +# define U_ICU_ENTRY_POINT_RENAME(x) x ## _ ## 46 ## |
| 111 # define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt####major##minor##_dat |
| 112 |
| 113 # endif |
OLD | NEW |