stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6728728: (se) WindowsSelectorImpl.c doesn't compile with Visual Studio 2008

Browse Source 
Reviewed-by: tbell, chegar
This commit is contained in:
Alan Bateman 2008-07-24 12:40:30 +01:00
parent 00e6ff0db3
commit 2fa9f3bee9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdk/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c
View File

@ -37,6 +37,7 @@
#include "jni.h" #include "jni.h"
#include "jni_util.h" #include "jni_util.h"
#include "sun_nio_ch_WindowsSelectorImpl.h" #include "sun_nio_ch_WindowsSelectorImpl.h"
#include "sun_nio_ch_PollArrayWrapper.h"
#include "winsock2.h" #include "winsock2.h"
@ -45,10 +46,6 @@ typedef struct {
jshort events; jshort events;
} pollfd; } pollfd;
static int POLLIN = 1;
static int POLLCONN = 2;
static int POLLOUT = 4;
#define WAKEUP_SOCKET_BUF_SIZE 16 #define WAKEUP_SOCKET_BUF_SIZE 16
@ -82,11 +79,13 @@ Java_sun_nio_ch_WindowsSelectorImpl_00024SubSelector_poll0(JNIEnv *env, jobject
/* Set FD_SET structures required for select */ /* Set FD_SET structures required for select */
for (i = 0; i < numfds; i++) { for (i = 0; i < numfds; i++) {
if (fds[i].events & POLLIN) { if (fds[i].events & sun_nio_ch_PollArrayWrapper_POLLIN) {
readfds.fd_array[read_count] = fds[i].fd; readfds.fd_array[read_count] = fds[i].fd;
read_count++; read_count++;
} }
if (fds[i].events & (POLLOUT | POLLCONN)) { if (fds[i].events & (sun_nio_ch_PollArrayWrapper_POLLOUT |
sun_nio_ch_PollArrayWrapper_POLLCONN))
{
writefds.fd_array[write_count] = fds[i].fd; writefds.fd_array[write_count] = fds[i].fd;
write_count++; write_count++;
} }
@ -111,11 +110,13 @@ Java_sun_nio_ch_WindowsSelectorImpl_00024SubSelector_poll0(JNIEnv *env, jobject
/* prepare select structures for the i-th socket */ /* prepare select structures for the i-th socket */
errreadfds.fd_count = 0; errreadfds.fd_count = 0;
errwritefds.fd_count = 0; errwritefds.fd_count = 0;
if (fds[i].events & POLLIN) { if (fds[i].events & sun_nio_ch_PollArrayWrapper_POLLIN) {
errreadfds.fd_array[0] = fds[i].fd; errreadfds.fd_array[0] = fds[i].fd;
errreadfds.fd_count = 1; errreadfds.fd_count = 1;
} }
if (fds[i].events & (POLLOUT | POLLCONN)) { if (fds[i].events & (sun_nio_ch_PollArrayWrapper_POLLOUT |
sun_nio_ch_PollArrayWrapper_POLLCONN))
{
errwritefds.fd_array[0] = fds[i].fd; errwritefds.fd_array[0] = fds[i].fd;
errwritefds.fd_count = 1; errwritefds.fd_count = 1;
} }
@ -187,7 +188,8 @@ Java_sun_nio_ch_WindowsSelectorImpl_setWakeupSocket0(JNIEnv *env, jclass this,
jint scoutFd) jint scoutFd)
{ {
/* Write one byte into the pipe */ /* Write one byte into the pipe */
send(scoutFd, (char*)&POLLIN, 1, 0); const char byte = 1;
send(scoutFd, &byte, 1, 0);
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL