src/java.desktop/share/native/common/awt/debug/debug_mem.c

@@ -72,11 +72,12 @@
 
 /**************************************************
  * Global Data structures
  */
 static DMemState                DMemGlobalState;
-extern const DMemState *        DMemStatePtr = &DMemGlobalState;
+extern const DMemState *        DMemStatePtr;
+const DMemState* DMemStatePtr = &DMemGlobalState; //initialize separately to keep GCC happy
 static MemoryListLink           MemoryList = {NULL,NULL,FALSE};
 static dmutex_t                 DMemMutex = NULL;
 
 /**************************************************/
 

@@ -273,19 +274,18 @@
 Exit:
     DMutex_Exit(DMemMutex);
 }
 
 static void DMem_DumpHeader(MemoryBlockHeader * header) {
-    char        report[FILENAME_MAX+MAX_DECIMAL_DIGITS*3+1];
-    static const char * reportFormat =
-        "file:  %s, line %d\n"
-        "size:  %d bytes\n"
-        "order: %d\n"
-        "-------";
+    char        report[FILENAME_MAX+MAX_DECIMAL_DIGITS*3+1+8];
 
     DMem_VerifyHeader(header);
-    sprintf(report, reportFormat, header->filename, header->linenumber, header->size, header->order);
+    sprintf(report, "file:  %s, line %d\n"\
+                    "size:  %d bytes\n"\
+                    "order: %d\n"\
+                    "-------",
+            header->filename, (int)header->linenumber, (int)header->size, header->order);
     DTRACE_PRINTLN(report);
 }
 
 /*
  * Call this function at shutdown time to report any leaked blocks