--- old/src/share/vm/utilities/ostream.cpp	2015-05-27 21:59:55.426895158 -0400
+++ new/src/share/vm/utilities/ostream.cpp	2015-05-27 21:59:53.542788048 -0400
@@ -274,7 +274,7 @@
   size_t limit = (len + 16) / 16 * 16;
   for (size_t i = 0; i < limit; ++i) {
     if (i % 16 == 0) {
-      indent().print(INTPTR_FORMAT_W(07)":", i);
+      indent().print(INTPTR_FORMAT_W(07) ":", i);
     }
     if (i % 2 == 0) {
       print(" ");
@@ -946,7 +946,7 @@
     // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
     // we ever get round to introduce that method on the os class
     xs->head("hotspot_log version='%d %d'"
-             " process='%d' time_ms='"INT64_FORMAT"'",
+             " process='%d' time_ms='" INT64_FORMAT "'",
              LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
              os::current_process_id(), (int64_t)time_ms);
     // Write VM version header immediately.