OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natPlainSocketImpl.cc: Include sys/ioctl.h and sys/filio.h, if present.

Browse Source 
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
This commit is contained in:
Jerome Marc 2002-05-02 17:33:59 +00:00 committed by Tom Tromey
parent b303008e9a
commit 16034e4ba3
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
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

12
libjava/java/net/natPlainSocketImpl.cc
View File

@ -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 */