Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/os.hpp @ 18009:f73af4455d7d
Merge
author | asaha |
---|---|
date | Thu, 29 May 2014 09:56:06 -0700 |
parents | 364b73402247 917873d2983d |
children | 52b4284cb496 833b0f92429a |
comparison
equal
deleted
inserted
replaced
18008:da65bbf6f89e | 18009:f73af4455d7d |
---|---|
46 # include <setjmp.h> | 46 # include <setjmp.h> |
47 #endif | 47 #endif |
48 #ifdef TARGET_OS_FAMILY_bsd | 48 #ifdef TARGET_OS_FAMILY_bsd |
49 # include "jvm_bsd.h" | 49 # include "jvm_bsd.h" |
50 # include <setjmp.h> | 50 # include <setjmp.h> |
51 # ifdef __APPLE__ | |
52 # include <mach/mach_time.h> | |
53 # endif | |
51 #endif | 54 #endif |
52 | 55 |
53 class AgentLibrary; | 56 class AgentLibrary; |
54 | 57 |
55 // os defines the interface to operating system; this includes traditional | 58 // os defines the interface to operating system; this includes traditional |