Mercurial > hg > truffle
comparison src/share/vm/utilities/ostream.cpp @ 3960:f08d439fab8c
7089790: integrate bsd-port changes
Reviewed-by: kvn, twisti, jrose
Contributed-by: Kurt Miller <kurt@intricatesoftware.com>, Greg Lewis <glewis@eyesbeyond.com>, Jung-uk Kim <jkim@freebsd.org>, Christos Zoulas <christos@zoulas.com>, Landon Fuller <landonf@plausible.coop>, The FreeBSD Foundation <board@freebsdfoundation.org>, Michael Franz <mvfranz@gmail.com>, Roger Hoover <rhoover@apple.com>, Alexander Strange <astrange@apple.com>
author | never |
---|---|
date | Sun, 25 Sep 2011 16:03:29 -0700 |
parents | 2a241e764894 |
children | 11c26bfcf8c7 |
comparison
equal
deleted
inserted
replaced
3959:eda6988c0d81 | 3960:f08d439fab8c |
---|---|
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_bsd | |
43 # include "os_bsd.inline.hpp" | |
41 #endif | 44 #endif |
42 | 45 |
43 extern "C" void jio_print(const char* s); // Declarationtion of jvm method | 46 extern "C" void jio_print(const char* s); // Declarationtion of jvm method |
44 | 47 |
45 outputStream::outputStream(int width) { | 48 outputStream::outputStream(int width) { |
990 } | 993 } |
991 } | 994 } |
992 | 995 |
993 #ifndef PRODUCT | 996 #ifndef PRODUCT |
994 | 997 |
995 #if defined(SOLARIS) || defined(LINUX) | 998 #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE) |
996 #include <sys/types.h> | 999 #include <sys/types.h> |
997 #include <sys/socket.h> | 1000 #include <sys/socket.h> |
998 #include <netinet/in.h> | 1001 #include <netinet/in.h> |
999 #include <arpa/inet.h> | 1002 #include <arpa/inet.h> |
1000 #endif | 1003 #endif |