aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/net/natPlainSocketImpl.cc
diff options
context:
space:
mode:
authorJerome Marc <marcjero@yahoo.com>2002-05-02 17:33:59 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-05-02 17:33:59 +0000
commit16034e4ba3fd9c4e07b00499535b606b781f80b7 (patch)
tree857286c76f4b52564a7c2781a0bf8b7d23d38e21 /libjava/java/net/natPlainSocketImpl.cc
parentb303008e9aa0f713866b4bc7456289543825f1cb (diff)
downloadgcc-16034e4ba3fd9c4e07b00499535b606b781f80b7.zip
gcc-16034e4ba3fd9c4e07b00499535b606b781f80b7.tar.gz
gcc-16034e4ba3fd9c4e07b00499535b606b781f80b7.tar.bz2
natPlainSocketImpl.cc: Include sys/ioctl.h and sys/filio.h, if present.
2002-05-02 Jerome Marc <marcjero@yahoo.com> * java/net/natPlainSocketImpl.cc: Include sys/ioctl.h and sys/filio.h, if present. From-SVN: r53050
Diffstat (limited to 'libjava/java/net/natPlainSocketImpl.cc')
-rw-r--r--libjava/java/net/natPlainSocketImpl.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 2c6a241..e16c372 100644
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -46,11 +46,23 @@ read(int s, void *buf, int len)
#define ENOPROTOOPT 109
#endif
#else /* WIN32 */
+
+#ifdef HAVE_SYS_IOCTL_H
+#define BSD_COMP /* Get FIONREAD on Solaris2. */
+#include <sys/ioctl.h>
+#endif
+
+// Pick up FIONREAD on Solaris 2.5.
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <errno.h>
#include <string.h>
+
#endif /* WIN32 */
#endif /* DISABLE_JAVA_NET */