[or-cvs] On OSX, decline to use the built-in select-baed poll wrappe...

[nickm@seul.org (Nick Mathewson)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv1607/or

Modified Files:
	main.c or.h 
Log Message:
On OSX, decline to use the built-in select-baed poll wrapper, since it seems to sometimes not work.

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- main.c	30 Jan 2004 19:31:39 -0000	1.167
+++ main.c	20 Feb 2004 23:41:45 -0000	1.168
@@ -520,7 +520,7 @@
     timeout = prepare_for_poll();
 
     /* poll until we have an event, or the second ends */
-    poll_result = poll(poll_array, nfds, timeout);
+    poll_result = tor_poll(poll_array, nfds, timeout);
 
     /* let catch() handle things like ^c, and otherwise don't worry about it */
     if(poll_result < 0) {

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- or.h	18 Feb 2004 07:23:35 -0000	1.225
+++ or.h	20 Feb 2004 23:41:45 -0000	1.226
@@ -26,13 +26,7 @@
 #include <ctype.h>
 #endif
 #include "../common/torint.h"
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#elif HAVE_POLL_H
-#include <poll.h>
-#else
 #include "../common/fakepoll.h"
-#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
 #endif