| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 ****************************************************************************** | 2 ****************************************************************************** |
| 3 * | 3 * |
| 4 * Copyright (C) 1997-2010, International Business Machines | 4 * Copyright (C) 1997-2010, International Business Machines |
| 5 * Corporation and others. All Rights Reserved. | 5 * Corporation and others. All Rights Reserved. |
| 6 * | 6 * |
| 7 ****************************************************************************** | 7 ****************************************************************************** |
| 8 * | 8 * |
| 9 * FILE NAME : platform.h | 9 * FILE NAME : platform.h |
| 10 * | 10 * |
| 11 * Date Name Description | 11 * Date Name Description |
| 12 * 05/13/98 nos Creation (content moved here from ptypes.h). | 12 * 05/13/98 nos Creation (content moved here from ptypes.h). |
| 13 * 03/02/99 stephen Added AS400 support. | 13 * 03/02/99 stephen Added AS400 support. |
| 14 * 03/30/99 stephen Added Linux support. | 14 * 03/30/99 stephen Added Linux support. |
| 15 * 04/13/99 stephen Reworked for autoconf. | 15 * 04/13/99 stephen Reworked for autoconf. |
| 16 ****************************************************************************** | 16 ****************************************************************************** |
| 17 */ | 17 */ |
| 18 | 18 |
| 19 /** | 19 /** |
| 20 * \file | 20 * \file |
| 21 * \brief Configuration constants for the Windows platform | 21 * \brief Configuration constants for the Windows platform |
| 22 */ | 22 */ |
| 23 | 23 |
| 24 /** Define the platform we're on. */ | 24 /** Define the platform we're on. */ |
| 25 #ifndef U_WINDOWS | 25 #ifndef U_WINDOWS |
| 26 #define U_WINDOWS | 26 #define U_WINDOWS |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 #if _MSC_VER >= 1700 |
| 30 #include <stdint.h> |
| 31 #endif |
| 32 |
| 29 #if defined(__BORLANDC__) | 33 #if defined(__BORLANDC__) |
| 30 #define U_HAVE_PLACEMENT_NEW 0 | 34 #define U_HAVE_PLACEMENT_NEW 0 |
| 31 #define __STDC_CONSTANT_MACROS | 35 #define __STDC_CONSTANT_MACROS |
| 32 #endif | 36 #endif |
| 33 | 37 |
| 34 /** _MSC_VER is used to detect the Microsoft compiler. */ | 38 /** _MSC_VER is used to detect the Microsoft compiler. */ |
| 35 #if defined(_MSC_VER) | 39 #if defined(_MSC_VER) |
| 36 #define U_INT64_IS_LONG_LONG 0 | 40 #define U_INT64_IS_LONG_LONG 0 |
| 37 #else | 41 #else |
| 38 #define U_INT64_IS_LONG_LONG 1 | 42 #define U_INT64_IS_LONG_LONG 1 |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 /** @{ Programs used by ICU code
*/ | 367 /** @{ Programs used by ICU code
*/ |
| 364 /*===========================================================================*/ | 368 /*===========================================================================*/ |
| 365 | 369 |
| 366 #ifndef U_MAKE | 370 #ifndef U_MAKE |
| 367 #define U_MAKE "nmake" | 371 #define U_MAKE "nmake" |
| 368 #define U_MAKE_IS_NMAKE 1 | 372 #define U_MAKE_IS_NMAKE 1 |
| 369 #endif | 373 #endif |
| 370 | 374 |
| 371 /** @} */ | 375 /** @} */ |
| 372 | 376 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11103047:
Fix compilation errors on VS2012 (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu46/