2010-05-13 Geoff Norton <gnorton@novell.com>

	* fakepoll.h: Added for OSX
	* serial.c:
	* signal.c: poll on OSX is broken, so we use a select based
	implementation instead.

svn path=/trunk/mono/; revision=158861

diff --git a/support/ChangeLog b/support/ChangeLog
index f659acd732bf4aeda966be89d34085c24d73de3a..1462a1a70b342b14ab810b845c1e1ce4ba9dbea7 100644 (file)
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-13  Geoff Norton  <gnorton@novell.com>
+
+       * fakepoll.h: Added for OSX
+       * serial.c:
+       * signal.c: poll on OSX is broken, so we use a select based 
+       implementation instead.
+
 2010-04-19 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * zlib-helper.c: don't call Z_FINISH if nothing has been written.

diff --git a/support/Makefile.am b/support/Makefile.am
index fd7f1359dd19b63e5a7882a297ae6fc467dc19ab..17ffd7d9eebb4abc88cf21516aa87961a68593e0 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -26,6 +26,7 @@ MPH_C_SOURCE =                                        \
 # Source code which helps implement POSIX and other related Unix standards,
 # and *may* be portable between Unix platforms.
 MPH_UNIX_SOURCE =                              \
+       fakepoll.h                              \
        dirent.c                                \
        fcntl.c                                 \
        fstab.c                                 \

diff --git a/support/serial.c b/support/serial.c
index 7968fbb30d059ea5eb844be5a9ade5d775df3d7c..a6ad955179205d6fcdd750c3a670402f297ae3f1 100644 (file)
--- a/support/serial.c
+++ b/support/serial.c
@@ -9,9 +9,13 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
+#include <errno.h>
+#if defined(__APPLE__)
+#include "fakepoll.h"
+#else
 #include <sys/poll.h>
+#endif
 #include <sys/ioctl.h>
-#include <errno.h>
 
 #include <glib.h>
 

diff --git a/support/signal.c b/support/signal.c
index c92bf3c69d3f3679e44cf6286b78b9b905935aa4..abd76382f0bc5646fdef31b4e1060f083f26a28d 100644 (file)
--- a/support/signal.c
+++ b/support/signal.c
@@ -18,7 +18,11 @@
 #ifndef HOST_WIN32
 #include <sys/time.h>
 #include <sys/types.h>
+#if defined(__APPLE__)
+#include "fakepoll.h"
+#else
 #include <poll.h>
+#endif
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>