Mercurial > hg > truffle
changeset 3835:a68e11dceb83
Merge
author | zgu |
---|---|
date | Tue, 16 Aug 2011 09:18:47 -0400 |
parents | 279ef1916773 (current diff) 46cb9a7b8b01 (diff) |
children | 00ed4ccfe642 |
files | |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/Makefile Tue Jul 12 21:13:53 2011 -0400 +++ b/make/linux/Makefile Tue Aug 16 09:18:47 2011 -0400 @@ -230,7 +230,7 @@ # Solaris 2.5.1, 2.6). # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. -SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% +SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% OS_VERSION := $(shell uname -r) EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
--- a/src/share/vm/runtime/os.cpp Tue Jul 12 21:13:53 2011 -0400 +++ b/src/share/vm/runtime/os.cpp Tue Aug 16 09:18:47 2011 -0400 @@ -1299,7 +1299,7 @@ size_t sz, i = 0; // read until EOF, EOL or buf is full - while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-1) && buf[i] != '\n') { + while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') { ++i; } @@ -1320,7 +1320,7 @@ } // line is longer than size of buf, skip to EOL - int ch; + char ch; while (read(fd, &ch, 1) == 1 && ch != '\n') { // Do nothing }