Mercurial > hg > truffle
diff src/share/vm/runtime/timer.cpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | bdd155477289 |
children | d8041d695d19 9c9f4dac029b 78bbf4d43a14 |
line wrap: on
line diff
--- a/src/share/vm/runtime/timer.cpp Mon Mar 24 10:48:44 2014 -0700 +++ b/src/share/vm/runtime/timer.cpp Wed Mar 26 18:21:05 2014 -0700 @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" #endif +#ifdef TARGET_OS_FAMILY_aix +# include "os_aix.inline.hpp" +#endif #ifdef TARGET_OS_FAMILY_bsd # include "os_bsd.inline.hpp" #endif