diff -r d2276da7c259 -r 4d3f4bca0019 hotspot/src/os/solaris/vm/decoder_solaris.cpp
--- a/hotspot/src/os/solaris/vm/decoder_solaris.cpp	Wed Jan 11 17:58:26 2012 -0500
+++ b/hotspot/src/os/solaris/vm/decoder_solaris.cpp	Tue Jan 17 13:08:52 2012 -0500
@@ -22,10 +22,11 @@
  *
  */
 
-#include "utilities/decoder.hpp"
+#include "utilities/decoder_elf.hpp"
 
 #include <demangle.h>
 
-bool Decoder::demangle(const char* symbol, char *buf, int buflen) {
+bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) {
   return !cplus_demangle(symbol, buf, (size_t)buflen);
 }
+