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

*** 72,82 ****
  
  /**************************************************
   * Global Data structures
   */
  static DMemState                DMemGlobalState;
! extern const DMemState *        DMemStatePtr = &DMemGlobalState;
  static MemoryListLink           MemoryList = {NULL,NULL,FALSE};
  static dmutex_t                 DMemMutex = NULL;
  
  /**************************************************/
  
--- 72,84 ----
  
  /**************************************************
   * Global Data structures
   */
  static DMemState                DMemGlobalState;
! extern const DMemState *        DMemStatePtr;
! //Do this to avoid compiler warning about const extern initialization.
! const DMemState* DMemStatePtr = &DMemGlobalState;
  static MemoryListLink           MemoryList = {NULL,NULL,FALSE};
  static dmutex_t                 DMemMutex = NULL;
  
  /**************************************************/
  
*** 274,291 ****
      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"
-         "-------";
  
      DMem_VerifyHeader(header);
!     sprintf(report, reportFormat, header->filename, header->linenumber, header->size, header->order);
      DTRACE_PRINTLN(report);
  }
  
  /*
   * Call this function at shutdown time to report any leaked blocks
--- 276,292 ----
      DMutex_Exit(DMemMutex);
  }
  
  static void DMem_DumpHeader(MemoryBlockHeader * header) {
      char        report[FILENAME_MAX+MAX_DECIMAL_DIGITS*3+1];
  
      DMem_VerifyHeader(header);
!     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