Mercurial > hg > truffle
comparison src/share/vm/runtime/os.hpp @ 2477:3449f5e02cc4
Merge
author | coleenp |
---|---|
date | Tue, 12 Apr 2011 14:18:53 -0700 |
parents | 677234770800 |
children | 188c9a5d6a6d |
comparison
equal
deleted
inserted
replaced
2468:6c97c830fb6f | 2477:3449f5e02cc4 |
---|---|
656 static int loadavg(double loadavg[], int nelem); | 656 static int loadavg(double loadavg[], int nelem); |
657 | 657 |
658 // Hook for os specific jvm options that we don't want to abort on seeing | 658 // Hook for os specific jvm options that we don't want to abort on seeing |
659 static bool obsolete_option(const JavaVMOption *option); | 659 static bool obsolete_option(const JavaVMOption *option); |
660 | 660 |
661 // Read file line by line. If line is longer than bsize, | |
662 // rest of line is skipped. Returns number of bytes read or -1 on EOF | |
663 static int get_line_chars(int fd, char *buf, const size_t bsize); | |
664 | |
661 // Platform dependent stuff | 665 // Platform dependent stuff |
662 #ifdef TARGET_OS_FAMILY_linux | 666 #ifdef TARGET_OS_FAMILY_linux |
663 # include "os_linux.hpp" | 667 # include "os_linux.hpp" |
664 #endif | 668 #endif |
665 #ifdef TARGET_OS_FAMILY_solaris | 669 #ifdef TARGET_OS_FAMILY_solaris |