Reapply "Use platform-independent format specifiers when disassembling code objects."

runtime/platform/globals.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef PLATFORM_GLOBALS_H_
 #define PLATFORM_GLOBALS_H_
 
-// __STDC_FORMAT_MACROS has to be defined to enable platform independent printf.
+// __STDC_FORMAT_MACROS has to be defined before including <inttypes.h> to
+// enable platform independent printf format specifiers.
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif
 
 #if defined(_WIN32)
 // Cut down on the amount of stuff that gets included via windows.h.
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
 #define NOKERNEL
 #define NOUSER
@@ skipping 82 matching lines @@
 #if !defined(ARCH_IS_64_BIT)
 #error Mismatched Host/Target architectures.
 #endif
 #elif defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_ARM)
 #if !defined(ARCH_IS_32_BIT)
 #error Mismatched Host/Target architectures.
 #endif
 #endif
 
 
-// Printf format for intptr_t on Windows.
-#if !defined(PRIxPTR) && defined(TARGET_OS_WINDOWS)
+// Printf format specifiers for intptr_t on Windows.
+#if defined(TARGET_OS_WINDOWS)

[Kevin Millikin (Google), 2012/08/02 14:57:27]

PRIdPTR was not defined here before.  PRIdPTR should be "d" and "lld" on 32- and
64-bit.  PRIxPTR should be "x" and "llx".

 #if defined(ARCH_IS_32_BIT)
-#define PRIxPTR "x"
+#define DART_PRINTF_PTR_PREFIX ""
 #else
-#define PRIxPTR "llx"
-#endif  // defined(ARCH_IS_32_BIT)
-#endif  // !defined(PRIxPTR) && defined(TARGET_OS_WINDOWS)
+#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)
 
 
 // Suffixes for 64-bit integer literals.
 #ifdef _MSC_VER
 #define DART_INT64_C(x) x##I64
 #define DART_UINT64_C(x) x##UI64
 #else
 #define DART_INT64_C(x) x##LL
 #define DART_UINT64_C(x) x##ULL
 #endif
@@ skipping 210 matching lines @@
 // separate lines with body in {}s).
 # define TEMP_FAILURE_RETRY(expression)                                        \
     ({ int64_t __result;                                                       \
        do {                                                                    \
          __result = (int64_t) (expression);                                    \
        } while (__result == -1L && errno == EINTR);                            \
        __result; })
 #endif
 
 #endif  // PLATFORM_GLOBALS_H_