Mercurial > hg > graal-compiler
diff src/share/vm/utilities/ostream.cpp @ 14456:abec000618bf
Merge
author | kvn |
---|---|
date | Tue, 28 Jan 2014 12:25:34 -0800 |
parents | 2b8e28fdf503 |
children | d8041d695d19 f42c10a3d4b1 |
line wrap: on
line diff
--- a/src/share/vm/utilities/ostream.cpp Tue Jan 28 11:21:43 2014 -0800 +++ b/src/share/vm/utilities/ostream.cpp Tue Jan 28 12:25:34 2014 -0800 @@ -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>