Mercurial > hg > openjdk > jdk6 > hotspot
changeset 1128:205530975d83
6929005: Fix HS16 merge issues in OpenJDK 6
Summary: Make vmError.cpp and JDK_PREVIOUS_VERSION setting match hs16.
Reviewed-by: darcy
| author | andrew |
|---|---|
| date | Wed, 24 Feb 2010 01:07:58 +0000 |
| parents | 9d5a6ef59f46 |
| children | b13f90e8e0e5 |
| files | make/hotspot_version src/share/vm/utilities/vmError.hpp |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/hotspot_version Mon Feb 22 19:58:50 2010 +0000 +++ b/make/hotspot_version Wed Feb 24 01:07:58 2010 +0000 @@ -42,4 +42,4 @@ JDK_MICRO_VER=0 # Previous (bootdir) JDK version -JDK_PREVIOUS_VERSION=1.5.0 +JDK_PREVIOUS_VERSION=1.6.0
--- a/src/share/vm/utilities/vmError.hpp Mon Feb 22 19:58:50 2010 +0000 +++ b/src/share/vm/utilities/vmError.hpp Wed Feb 24 01:07:58 2010 +0000 @@ -50,7 +50,7 @@ // additional info for VM internal errors const char * _filename; - size_t _lineno; + int _lineno; // used by fatal error handler int _current_step;