From 36c8b9421758a93160cf3e6bfcd0bd47a2093d07 Mon Sep 17 00:00:00 2001
From: manojampalam <manojampalam@live.com>
Date: Sat, 5 Mar 2016 13:51:19 -0800
Subject: [PATCH] 3-5 C3

---
 .../w32-posix-prototype/win32posix/win32posix/inc/defs.h  | 1 -
 .../win32posix/win32posix/inc/sys/select.h                | 1 +
 .../win32posix/win32posix/inc/w32posix.h                  | 6 +++---
 .../w32-posix-prototype/win32posix/win32posix/w32fd.c     | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/defs.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/defs.h
index 77518e3..a56ea3f 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/defs.h
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/defs.h
@@ -7,7 +7,6 @@
 
 #include <memory.h>
 
-#define fd_set w32_fd_set
 #undef FD_ZERO
 #define FD_ZERO(set) (memset( (set), 0, sizeof(w32_fd_set)))
 #undef FD_SET
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/select.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/select.h
index bb6720a..123b169 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/select.h
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/select.h
@@ -5,5 +5,6 @@
 */
 #include "..\w32posix.h"
 
+#define fd_set w32_fd_set
 #define select w32_select
 
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/w32posix.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/w32posix.h
index 5b135af..95d07ca 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/w32posix.h
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/w32posix.h
@@ -10,8 +10,8 @@
 #include <stdio.h>
 #include "defs.h"
 
-//File Descriptor definitions
-#define MAX_FDS 128 //a 2^n number
+/* total fds that can be allotted */
+#define MAX_FDS 256  /* a 2^n number */
 
 typedef struct w32_fd_set_ {
 	unsigned char bitmap[MAX_FDS >> 3];
@@ -50,7 +50,7 @@ FILE* w32_fdopen(int fd, const char *mode);
 /*common i/o*/
 #define fcntl w32_fcntl
 int w32_close(int fd);
-int w32_select(int fds, fd_set* readfds, fd_set* writefds, fd_set* exceptfds, 
+int w32_select(int fds, w32_fd_set* readfds, w32_fd_set* writefds, w32_fd_set* exceptfds, 
 	const struct timeval *timeout);
 int w32_fcntl(int fd, int cmd, ... /* arg */);
 int w32_dup(int oldfd);
diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c b/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c
index 77b737c..a05f428 100644
--- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c
+++ b/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c
@@ -411,18 +411,18 @@ w32_fcntl(int fd, int cmd, ... /* arg */) {
 }
 
 int
-w32_select(int fds, fd_set* readfds, fd_set* writefds, fd_set* exceptfds, 
+w32_select(int fds, w32_fd_set* readfds, w32_fd_set* writefds, w32_fd_set* exceptfds, 
     const struct timeval *timeout) {
 	ULONGLONG ticks_start = GetTickCount64(), ticks_now;
-	fd_set read_ready_fds, write_ready_fds;
+	w32_fd_set read_ready_fds, write_ready_fds;
 	HANDLE events[32];
 	int num_events = 0;
 	int in_set_fds = 0, out_ready_fds = 0, i;
 	unsigned int time_milliseconds = timeout->tv_sec * 100 + timeout->tv_usec / 1000;
 
 	errno = 0;
-	memset(&read_ready_fds, 0, sizeof(fd_set));
-	memset(&write_ready_fds, 0, sizeof(fd_set));
+	memset(&read_ready_fds, 0, sizeof(w32_fd_set));
+	memset(&write_ready_fds, 0, sizeof(w32_fd_set));
 
 	if (fds > MAX_FDS) {
 		errno = EINVAL;