blob: 850a4a1dd3244fee717d33e92bc1116900e6ad40 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
$FreeBSD$
--- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig Wed Jun 13 16:16:36 2007
+++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp Wed Jun 13 16:36:13 2007
@@ -364,7 +364,7 @@
* 7: The default directories, normally /lib and /usr/lib.
*/
#ifndef DEFAULT_LIBPATH
-#define DEFAULT_LIBPATH "/lib:/usr/lib"
+#define DEFAULT_LIBPATH "/lib:/usr/lib:%%LOCALBASE%%/lib"
#endif
#define EXTENSIONS_DIR "/lib/ext"
@@ -1431,10 +1431,10 @@
void os::Bsd::clock_init() {
struct timespec res;
struct timespec tp;
- if (clock_getres(CLOCK_MONOTONIC, &res) == 0 &&
- clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
+ if (::clock_getres(CLOCK_MONOTONIC, &res) == 0 &&
+ ::clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
// yes, monotonic clock is supported
- _clock_gettime = clock_gettime;
+ _clock_gettime = ::clock_gettime;
}
}
#else
|
