--- a/hotspot/src/os/windows/vm/os_windows.cpp	Mon Feb 29 15:42:34 2016 +0000
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Mon Feb 29 08:50:57 2016 +0100
@@ -543,8 +543,7 @@
 // Helper function to trace _beginthreadex attributes,
 //  similar to os::Posix::describe_pthread_attr()
 static char* describe_beginthreadex_attributes(char* buf, size_t buflen,
-  size_t stacksize, unsigned initflag)
-{
+                                               size_t stacksize, unsigned initflag) {
   stringStream ss(buf, buflen);
   if (stacksize == 0) {
     ss.print("stacksize: default, ");
@@ -552,7 +551,7 @@
     ss.print("stacksize: " SIZE_FORMAT "k, ", stacksize / 1024);
   }
   ss.print("flags: ");
-  #define PRINT_FLAG(f) if (initflag & f) ss.print( XSTR(f) " ");
+  #define PRINT_FLAG(f) if (initflag & f) ss.print( #f " ");
   #define ALL(X) \
     X(CREATE_SUSPENDED) \
     X(STACK_SIZE_PARAM_IS_A_RESERVATION)