summaryrefslogtreecommitdiffstats
path: root/libjava/java
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-05-02 17:33:59 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-05-02 17:33:59 +0000
commitf206296f95beecbc552bbf248a361f07895204d0 (patch)
tree857286c76f4b52564a7c2781a0bf8b7d23d38e21 /libjava/java
parent4cba71384b9535e002cffdf2aae285ce1ba34d72 (diff)
downloadppe42-gcc-f206296f95beecbc552bbf248a361f07895204d0.tar.gz
ppe42-gcc-f206296f95beecbc552bbf248a361f07895204d0.zip
2002-05-02 Jerome Marc <marcjero@yahoo.com>
* java/net/natPlainSocketImpl.cc: Include sys/ioctl.h and sys/filio.h, if present. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53050 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
-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 2c6a2415cfb..e16c372d989 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 */
OpenPOWER on IntegriCloud