comparison src/share/vm/utilities/ostream.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents d8041d695d19
children 52b4284cb496
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
36 #ifdef TARGET_OS_FAMILY_solaris 36 #ifdef TARGET_OS_FAMILY_solaris
37 # include "os_solaris.inline.hpp" 37 # include "os_solaris.inline.hpp"
38 #endif 38 #endif
39 #ifdef TARGET_OS_FAMILY_windows 39 #ifdef TARGET_OS_FAMILY_windows
40 # include "os_windows.inline.hpp" 40 # include "os_windows.inline.hpp"
41 #endif
42 #ifdef TARGET_OS_FAMILY_aix
43 # include "os_aix.inline.hpp"
44 #endif 41 #endif
45 #ifdef TARGET_OS_FAMILY_bsd 42 #ifdef TARGET_OS_FAMILY_bsd
46 # include "os_bsd.inline.hpp" 43 # include "os_bsd.inline.hpp"
47 #endif 44 #endif
48 45
1239 } 1236 }
1240 } 1237 }
1241 1238
1242 #ifndef PRODUCT 1239 #ifndef PRODUCT
1243 1240
1244 #if defined(SOLARIS) || defined(LINUX) || defined(AIX) || defined(_ALLBSD_SOURCE) 1241 #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
1245 #include <sys/types.h> 1242 #include <sys/types.h>
1246 #include <sys/socket.h> 1243 #include <sys/socket.h>
1247 #include <netinet/in.h> 1244 #include <netinet/in.h>
1248 #include <arpa/inet.h> 1245 #include <arpa/inet.h>
1249 #endif 1246 #endif