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
+2002-05-02 Jerome Marc <marcjero@yahoo.com>
+
+ * java/net/natPlainSocketImpl.cc: Include sys/ioctl.h and
+ sys/filio.h, if present.
+
2002-04-30 Tom Tromey <tromey@redhat.com>
* java/io/BufferedReader.java (fill): Handle case where markPos
#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 */