Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/timer.cpp @ 14456:abec000618bf
Merge
author | kvn |
---|---|
date | Tue, 28 Jan 2014 12:25:34 -0800 |
parents | bdd155477289 |
children | d8041d695d19 9c9f4dac029b 78bbf4d43a14 |
comparison
equal
deleted
inserted
replaced
14269:2a8891e0a082 | 14456:abec000618bf |
---|---|
32 #ifdef TARGET_OS_FAMILY_solaris | 32 #ifdef TARGET_OS_FAMILY_solaris |
33 # include "os_solaris.inline.hpp" | 33 # include "os_solaris.inline.hpp" |
34 #endif | 34 #endif |
35 #ifdef TARGET_OS_FAMILY_windows | 35 #ifdef TARGET_OS_FAMILY_windows |
36 # include "os_windows.inline.hpp" | 36 # include "os_windows.inline.hpp" |
37 #endif | |
38 #ifdef TARGET_OS_FAMILY_aix | |
39 # include "os_aix.inline.hpp" | |
37 #endif | 40 #endif |
38 #ifdef TARGET_OS_FAMILY_bsd | 41 #ifdef TARGET_OS_FAMILY_bsd |
39 # include "os_bsd.inline.hpp" | 42 # include "os_bsd.inline.hpp" |
40 #endif | 43 #endif |
41 | 44 |