changeset 9346:afc51ec63594

8035876: AIX build issues after '8034174: Remove use of JVM_* functions from java.net code' Reviewed-by: alanb, chegar
author simonis
date Thu, 27 Feb 2014 10:53:07 +0100
parents 0731952efb10
children d77c747d5a93
files src/solaris/native/java/net/net_util_md.c src/solaris/native/java/net/net_util_md.h
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/native/java/net/net_util_md.c	Thu Feb 27 02:44:04 2014 +0400
+++ b/src/solaris/native/java/net/net_util_md.c	Thu Feb 27 10:53:07 2014 +0100
@@ -65,6 +65,10 @@
 
 #endif
 
+#ifdef _AIX
+#include <sys/ioctl.h>
+#endif
+
 #include "jni_util.h"
 #include "jvm.h"
 #include "net_util.h"
--- a/src/solaris/native/java/net/net_util_md.h	Thu Feb 27 02:44:04 2014 +0400
+++ b/src/solaris/native/java/net/net_util_md.h	Thu Feb 27 10:53:07 2014 +0100
@@ -49,9 +49,12 @@
 int NET_Accept(int s, struct sockaddr *addr, socklen_t *addrlen);
 int NET_SocketClose(int s);
 int NET_Dup2(int oldfd, int newfd);
+#ifdef USE_SELECT
 extern int NET_Select(int s, fd_set *readfds, fd_set *writefds,
                fd_set *exceptfds, struct timeval *timeout);
+#else
 extern int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout);
+#endif
 
 int NET_SocketAvailable(int s, jint *pbytes);