*** old/src/share/vm/utilities/decoder.hpp	Tue Sep 13 12:21:10 2011
--- new/src/share/vm/utilities/decoder.hpp	Tue Sep 13 12:21:10 2011

*** 36,45 ****
--- 36,47 ----
  typedef DWORD (WINAPI *pfn_SymSetOptions)(DWORD);
  typedef BOOL  (WINAPI *pfn_SymInitialize)(HANDLE, PCTSTR, BOOL);
  typedef BOOL  (WINAPI *pfn_SymGetSymFromAddr64)(HANDLE, DWORD64, PDWORD64, PIMAGEHLP_SYMBOL64);
  typedef DWORD (WINAPI *pfn_UndecorateSymbolName)(const char*, char*, DWORD, DWORD);
  
+ #elif defined(__APPLE__)
+ 
  #else
  
  class ElfFile;
  
  #endif // _WINDOWS

*** 77,87 ****
--- 79,89 ----
  
    static bool              demangle(const char* symbol, char *buf, int buflen);
  
    static decoder_status    get_status() { return _decoder_status; };
  
! #ifndef _WINDOWS
! #if !defined(_WINDOWS) && !defined(__APPLE__)
   private:
    static ElfFile*         get_elf_file(const char* filepath);
  #endif // _WINDOWS
  
  

*** 92,101 ****
--- 94,104 ----
  #ifdef _WINDOWS
    static HMODULE                   _dbghelp_handle;
    static bool                      _can_decode_in_vm;
    static pfn_SymGetSymFromAddr64   _pfnSymGetSymFromAddr64;
    static pfn_UndecorateSymbolName  _pfnUndecorateSymbolName;
+ #elif __APPLE__
  #else
    static ElfFile*                  _opened_elf_files;
  #endif // _WINDOWS
  };