comparison src/share/vm/runtime/osThread.hpp @ 18058:54bc75c144b0

Merge
author asaha
date Thu, 29 May 2014 13:14:25 -0700
parents bdd155477289
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
18055:1fa005fb28f5 18058:54bc75c144b0
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: