diff src/share/vm/utilities/elfSymbolTable.hpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents e7cbc95179c4
children 52b4284cb496
line wrap: on
line diff
--- a/src/share/vm/utilities/elfSymbolTable.hpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/utilities/elfSymbolTable.hpp	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
   ~ElfSymbolTable();
 
   // search the symbol that is nearest to the specified address.
-  bool lookup(address addr, int* stringtableIndex, int* posIndex, int* offset, ElfFuncDescTable* funcDescTable);
+  bool lookup(address addr, int* stringtableIndex, int* posIndex, int* offset);
 
   NullDecoder::decoder_status get_status() { return m_status; };
 
@@ -65,6 +65,6 @@
   NullDecoder::decoder_status  m_status;
 };
 
-#endif // !_WINDOWS and !__APPLE__
+#endif // _WINDOWS and _APPLE
 
 #endif // SHARE_VM_UTILITIES_ELF_SYMBOL_TABLE_HPP