Left: | ||
Right: |
OLD | NEW |
---|---|
1 // © 2016 and later: Unicode, Inc. and others. | 1 // © 2016 and later: Unicode, Inc. and others. |
2 // License & terms of use: http://www.unicode.org/copyright.html | 2 // License & terms of use: http://www.unicode.org/copyright.html |
3 /* | 3 /* |
4 ****************************************************************************** | 4 ****************************************************************************** |
5 * | 5 * |
6 * Copyright (C) 1999-2015, International Business Machines | 6 * Copyright (C) 1999-2015, International Business Machines |
7 * Corporation and others. All Rights Reserved. | 7 * Corporation and others. All Rights Reserved. |
8 * | 8 * |
9 ****************************************************************************** | 9 ****************************************************************************** |
10 * file name: umachine.h | 10 * file name: umachine.h |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
284 # define U_WCHAR_IS_UTF16 | 284 # define U_WCHAR_IS_UTF16 |
285 # endif | 285 # endif |
286 #endif | 286 #endif |
287 | 287 |
288 /* UChar and UChar32 definitions -------------------------------------------- */ | 288 /* UChar and UChar32 definitions -------------------------------------------- */ |
289 | 289 |
290 /** Number of bytes in a UChar. @stable ICU 2.0 */ | 290 /** Number of bytes in a UChar. @stable ICU 2.0 */ |
291 #define U_SIZEOF_UCHAR 2 | 291 #define U_SIZEOF_UCHAR 2 |
292 | 292 |
293 /** | 293 /** |
294 * for AIX, uchar.h needs to be included | 294 * \def U_CHAR16_IS_TYPEDEF |
295 * If 1, then char16_t is a typedef and not a real type (yet) | |
296 * @internal | |
295 */ | 297 */ |
296 #if (U_PLATFORM == U_PF_AIX) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11 ) | 298 #if (U_PLATFORM == U_PF_AIX) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11 ) |
andy.heninger
2017/03/20 20:17:55
Remove the U_CPLUSPLUS_VERSION < 11
srl295
2017/03/20 20:30:34
as before, this is here as a future proof.
| |
299 // for AIX, uchar.h needs to be included | |
297 # include <uchar.h> | 300 # include <uchar.h> |
301 # define U_CHAR16_IS_TYPEDEF 1 | |
302 #else | |
303 # define U_CHAR16_IS_TYPEDEF 0 | |
298 #endif | 304 #endif |
299 | 305 |
300 | 306 |
301 /** | 307 /** |
302 * \var UChar | 308 * \var UChar |
303 * | 309 * |
304 * The base type for UTF-16 code units and pointers. | 310 * The base type for UTF-16 code units and pointers. |
305 * Unsigned 16-bit integer. | 311 * Unsigned 16-bit integer. |
306 * Starting with ICU 59, C++ API uses char16_t directly, while C API continues t o use UChar. | 312 * Starting with ICU 59, C++ API uses char16_t directly, while C API continues t o use UChar. |
307 * | 313 * |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
405 * | 411 * |
406 * @return -1 | 412 * @return -1 |
407 * @see UChar32 | 413 * @see UChar32 |
408 * @stable ICU 2.4 | 414 * @stable ICU 2.4 |
409 */ | 415 */ |
410 #define U_SENTINEL (-1) | 416 #define U_SENTINEL (-1) |
411 | 417 |
412 #include "unicode/urename.h" | 418 #include "unicode/urename.h" |
413 | 419 |
414 #endif | 420 #endif |
OLD | NEW |