Mercurial > hg > truffle
diff src/share/vm/utilities/ostream.cpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | 2b8e28fdf503 |
children | d8041d695d19 f42c10a3d4b1 |
line wrap: on
line diff
--- a/src/share/vm/utilities/ostream.cpp Mon Mar 24 10:48:44 2014 -0700 +++ b/src/share/vm/utilities/ostream.cpp Wed Mar 26 18:21:05 2014 -0700 @@ -39,6 +39,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" #endif +#ifdef TARGET_OS_FAMILY_aix +# include "os_aix.inline.hpp" +#endif #ifdef TARGET_OS_FAMILY_bsd # include "os_bsd.inline.hpp" #endif @@ -1238,7 +1241,7 @@ #ifndef PRODUCT -#if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE) +#if defined(SOLARIS) || defined(LINUX) || defined(AIX) || defined(_ALLBSD_SOURCE) #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h>