diff options
| author | Mark Wielaard <mark@klomp.org> | 2007-04-18 08:14:33 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2007-04-18 08:14:33 +0000 |
| commit | ef0603a0f5956c6fc3d04cf91701d6c311bd6466 (patch) | |
| tree | 70d4788c32769a425794b843589e3ee07052f3b8 | |
| parent | 7d6b20f457385b7b6b6e558da3b5806475aa5afa (diff) | |
| download | classpath-ef0603a0f5956c6fc3d04cf91701d6c311bd6466.tar.gz | |
2007-04-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/java-net/local.c:
Fix import of FIONREAD.
* native/jni/java-nio/gnu_java_nio_VMChannel.c,
* native/jni/native-lib/cpnet.c:
Likewise.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | native/jni/java-net/local.c | 9 | ||||
| -rw-r--r-- | native/jni/java-nio/gnu_java_nio_VMChannel.c | 9 | ||||
| -rw-r--r-- | native/jni/native-lib/cpnet.c | 9 |
4 files changed, 32 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2007-04-17 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * native/jni/java-net/local.c: + Fix import of FIONREAD. + * native/jni/java-nio/gnu_java_nio_VMChannel.c, + * native/jni/native-lib/cpnet.c: + Likewise. + 2007-04-16 Dalibor Topic <robilad@kaffe.org> * configure.ac (AM_PROG_CC_C_O): Added to fix automake 1.10 diff --git a/native/jni/java-net/local.c b/native/jni/java-net/local.c index c8ca91c2a..b7ec6f264 100644 --- a/native/jni/java-net/local.c +++ b/native/jni/java-net/local.c @@ -45,13 +45,20 @@ exception statement from your version. */ #include <unistd.h> #include <string.h> #include <errno.h> -#include <sys/ioctl.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> #include <stdio.h> +#if defined(HAVE_SYS_IOCTL_H) +#define BSD_COMP /* Get FIONREAD on Solaris2 */ +#include <sys/ioctl.h> +#endif +#if defined(HAVE_SYS_FILIO_H) /* Get FIONREAD on Solaris 2.5 */ +#include <sys/filio.h> +#endif + #include "local.h" const char * diff --git a/native/jni/java-nio/gnu_java_nio_VMChannel.c b/native/jni/java-nio/gnu_java_nio_VMChannel.c index 6ff4ece80..c8df841a1 100644 --- a/native/jni/java-nio/gnu_java_nio_VMChannel.c +++ b/native/jni/java-nio/gnu_java_nio_VMChannel.c @@ -43,7 +43,6 @@ exception statement from your version. */ #include <config-int.h> #include <sys/types.h> -#include <sys/ioctl.h> #include <sys/mman.h> #include <sys/socket.h> #include <sys/stat.h> @@ -67,6 +66,14 @@ exception statement from your version. */ #include <fcntl.h> #endif /* HAVE_FCNTL_H */ +#if defined(HAVE_SYS_IOCTL_H) +#define BSD_COMP /* Get FIONREAD on Solaris2 */ +#include <sys/ioctl.h> +#endif +#if defined(HAVE_SYS_FILIO_H) /* Get FIONREAD on Solaris 2.5 */ +#include <sys/filio.h> +#endif + #define CONNECT_EXCEPTION "java/net/ConnectException" #define IO_EXCEPTION "java/io/IOException" #define SOCKET_EXCEPTION "java/net/SocketException" diff --git a/native/jni/native-lib/cpnet.c b/native/jni/native-lib/cpnet.c index f4ff0f15a..22ce69e27 100644 --- a/native/jni/native-lib/cpnet.c +++ b/native/jni/native-lib/cpnet.c @@ -46,11 +46,18 @@ exception statement from your version. */ #include <netinet/in.h> #include <netinet/tcp.h> #include <netdb.h> -#include <sys/ioctl.h> #include <sys/time.h> #include <unistd.h> #include <arpa/inet.h> +#if defined(HAVE_SYS_IOCTL_H) +#define BSD_COMP /* Get FIONREAD on Solaris2 */ +#include <sys/ioctl.h> +#endif +#if defined(HAVE_SYS_FILIO_H) /* Get FIONREAD on Solaris 2.5 */ +#include <sys/filio.h> +#endif + #include "cpnet.h" #define SOCKET_DEFAULT_TIMEOUT -1 /* milliseconds */ |