Mercurial > hg > graal-jvmci-8

comparison src/share/vm/utilities/ostream.cpp @ 14456:abec000618bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Tue, 28 Jan 2014 12:25:34 -0800
parents 2b8e28fdf503
children d8041d695d19 f42c10a3d4b1
comparison
equal deleted inserted replaced
14269:2a8891e0a082 14456:abec000618bf
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"
41 #endif 44 #endif
42 #ifdef TARGET_OS_FAMILY_bsd 45 #ifdef TARGET_OS_FAMILY_bsd
43 # include "os_bsd.inline.hpp" 46 # include "os_bsd.inline.hpp"
44 #endif 47 #endif
45 48
1236 } 1239 }
1237 } 1240 }
1238 1241
1239 #ifndef PRODUCT 1242 #ifndef PRODUCT
1240 1243
1241 #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE) 1244 #if defined(SOLARIS) || defined(LINUX) || defined(AIX) || defined(_ALLBSD_SOURCE)
1242 #include <sys/types.h> 1245 #include <sys/types.h>
1243 #include <sys/socket.h> 1246 #include <sys/socket.h>
1244 #include <netinet/in.h> 1247 #include <netinet/in.h>
1245 #include <arpa/inet.h> 1248 #include <arpa/inet.h>
1246 #endif 1249 #endif