X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FSelect.c;h=932fc792fed511384d1a92cc3c51ba33b0585985;hb=099ead5c6163eb36d49d2883326128111b592825;hp=32dca96cd8c7c1f389bad938213570438ce68806;hpb=536942c5b15e2cd06bb274022c670b9ecbbef465;p=ghc-hetmet.git

diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index 32dca96..932fc79 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -6,19 +6,20 @@
  *
  * ---------------------------------------------------------------------------*/
 
-/* we're outside the realms of POSIX here... */
-/* #include "PosixSource.h" */
-
+#include "PosixSource.h"
 #include "Rts.h"
-#include "Storage.h"
+
+#include "Signals.h"
 #include "Schedule.h"
 #include "RtsUtils.h"
-#include "RtsFlags.h"
-#include "Timer.h"
 #include "Itimer.h"
-#include "Signals.h"
 #include "Capability.h"
-#include "posix/Select.h"
+#include "Select.h"
+#include "AwaitEvent.h"
+
+# ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+# endif
 
 # ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
@@ -155,7 +156,7 @@ awaitEvent(rtsBool wait)
 	case BlockedOnRead:
 	  { 
 	    int fd = tso->block_info.fd;
-	    if (fd >= (int)FD_SETSIZE) {
+	    if ((fd >= (int)FD_SETSIZE) || (fd < 0)) {
 		barf("awaitEvent: descriptor out of range");
 	    }
 	    maxfd = (fd > maxfd) ? fd : maxfd;
@@ -166,7 +167,7 @@ awaitEvent(rtsBool wait)
 	case BlockedOnWrite:
 	  { 
 	    int fd = tso->block_info.fd;
-	    if (fd >= (int)FD_SETSIZE) {
+	    if ((fd >= (int)FD_SETSIZE) || (fd < 0)) {
 		barf("awaitEvent: descriptor out of range");
 	    }
 	    maxfd = (fd > maxfd) ? fd : maxfd;