diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2006-11-18 19:33:52 +0300 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2006-11-18 19:33:52 +0300 |
| commit | 48082bacde0b5f9af21912624f72051c0e2b2f0f (patch) | |
| tree | 362a11957251e8e7d5461134474b1dc93812346f /support | |
| parent | aeda904b0bb282f7c9ee464a7d8e2ec068153522 (diff) | |
2006-11-18 Jelle Hissink <Jelle.Hissink@C-it.nl>
* serial.c (poll_serial): Add timeout parameter to poll.
Fixes #79722 and #79735
svn path=/trunk/mono/; revision=68123
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 6 | ||||
| -rw-r--r-- | support/serial.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 106dc927443..1eddf6e8920 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,9 @@ +2006-11-18 Jelle Hissink <Jelle.Hissink@C-it.nl> + + * serial.c (poll_serial): Add timeout parameter to poll. + + Fixes #79722 and #79735 + 2006-11-17 Jonathan Pryor <jonpryor@vt.edu> * map.c: Flush (fix FromFilePermissions for SuppressFlags-marked values). diff --git a/support/serial.c b/support/serial.c index c0d2dbdae9f..69f3a76ccec 100644 --- a/support/serial.c +++ b/support/serial.c @@ -322,7 +322,7 @@ set_signal (int fd, MonoSerialSignal signal, gboolean value) } gboolean -poll_serial (int fd, gint32 *error) +poll_serial (int fd, gint32 *error, int timeout) { struct pollfd pinfo; @@ -332,7 +332,7 @@ poll_serial (int fd, gint32 *error) pinfo.events = POLLIN; pinfo.revents = 0; - if (poll (&pinfo, 1, 0) == -1) { + if (poll (&pinfo, 1, timeout) == -1) { *error = -1; return FALSE; } |