| Index: runtime/platform/globals.h
|
| diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h
|
| index 4988ab8c9548ac4ae9310d7ae9dff56b951a099c..415e6c35a3cef82c5d92a3458bbecc64ee11b6dd 100644
|
| --- a/runtime/platform/globals.h
|
| +++ b/runtime/platform/globals.h
|
| @@ -5,8 +5,7 @@
|
| #ifndef PLATFORM_GLOBALS_H_
|
| #define PLATFORM_GLOBALS_H_
|
|
|
| -// __STDC_FORMAT_MACROS has to be defined before including <inttypes.h> to
|
| -// enable platform independent printf format specifiers.
|
| +// __STDC_FORMAT_MACROS has to be defined to enable platform independent printf.
|
| #ifndef __STDC_FORMAT_MACROS
|
| #define __STDC_FORMAT_MACROS
|
| #endif
|
| @@ -109,24 +108,14 @@
|
| #endif
|
|
|
|
|
| -// Printf format specifiers for intptr_t on Windows.
|
| -#if defined(TARGET_OS_WINDOWS)
|
| +// Printf format for intptr_t on Windows.
|
| +#if !defined(PRIxPTR) && defined(TARGET_OS_WINDOWS)
|
| #if defined(ARCH_IS_32_BIT)
|
| -#define DART_PRINTF_PTR_PREFIX ""
|
| +#define PRIxPTR "x"
|
| #else
|
| -#define DART_PRINTF_PTR_PREFIX "ll"
|
| -#endif
|
| -
|
| -#if !defined(PRIdPTR)
|
| -#define PRIdPTR DART_PRINTF_PTR_PREFIX "d"
|
| -#endif
|
| -
|
| -#if !defined(PRIxPTR)
|
| -#define PRIxPTR DART_PRINTF_PTR_PREFIX "x"
|
| -#endif
|
| -
|
| -#undef DART_PRINTF_PTR_PREFIX
|
| -#endif // defined(TARGET_OS_WINDOWS)
|
| +#define PRIxPTR "llx"
|
| +#endif // defined(ARCH_IS_32_BIT)
|
| +#endif // !defined(PRIxPTR) && defined(TARGET_OS_WINDOWS)
|
|
|
|
|
| // Suffixes for 64-bit integer literals.
|
|
|