Mercurial > hg > truffle
comparison src/share/vm/runtime/osThread.hpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | bdd155477289 |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
103 # include "osThread_solaris.hpp" | 103 # include "osThread_solaris.hpp" |
104 #endif | 104 #endif |
105 #ifdef TARGET_OS_FAMILY_windows | 105 #ifdef TARGET_OS_FAMILY_windows |
106 # include "osThread_windows.hpp" | 106 # include "osThread_windows.hpp" |
107 #endif | 107 #endif |
108 #ifdef TARGET_OS_FAMILY_aix | |
109 # include "osThread_aix.hpp" | |
110 #endif | |
108 #ifdef TARGET_OS_FAMILY_bsd | 111 #ifdef TARGET_OS_FAMILY_bsd |
109 # include "osThread_bsd.hpp" | 112 # include "osThread_bsd.hpp" |
110 #endif | 113 #endif |
111 | 114 |
112 public: | 115 public: |