diff options
| author | Geoff Norton <grompf@sublimeintervention.com> | 2010-06-14 01:59:48 +0400 |
|---|---|---|
| committer | Geoff Norton <grompf@sublimeintervention.com> | 2010-06-14 01:59:48 +0400 |
| commit | 262b1c435b9fb58d40ca5924ba4943ae94ba0b42 (patch) | |
| tree | a90088174f2e6177085b32ce427a71ba425adf2d /support | |
| parent | 021d7026a17d3ecb53f9e310ed07639ea99decd9 (diff) | |
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
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 7 | ||||
| -rw-r--r-- | support/Makefile.am | 1 | ||||
| -rw-r--r-- | support/serial.c | 6 | ||||
| -rw-r--r-- | support/signal.c | 4 |
4 files changed, 17 insertions, 1 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index f659acd732b..1462a1a70b3 100644 --- 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 fd7f1359dd1..17ffd7d9eeb 100644 --- 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 7968fbb30d0..a6ad9551792 100644 --- 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 c92bf3c69d3..abd76382f0b 100644 --- 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> |