diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-05 03:18:54 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-05 03:18:54 +0100 |
| commit | 1a1643576618c0ce0f206a8674dac6014ffa3bbe (patch) | |
| tree | 468be3c1df1192595cc36ee3f7f2b7c96447a94c | |
| parent | a597d9187fe2d0e9d2b3c7e411cd422ef6a4f16d (diff) | |
| parent | 89a988361909cc345663d8f7d777a006a605e9c9 (diff) | |
| download | xine-lib-1a1643576618c0ce0f206a8674dac6014ffa3bbe.tar.gz xine-lib-1a1643576618c0ce0f206a8674dac6014ffa3bbe.tar.bz2 | |
Merge Bastien Nocera's changes.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/xine-engine/io_helper.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a37988d24..389563fba 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl XINE_SUB += 1; continue with XINE_LT_* values below dnl XINE_MAJOR=1 XINE_MINOR=1 -XINE_SUB=6 +XINE_SUB=7 #if test $XINE_SUB -eq 0 ; then # XINE_SUBPART=""; diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c index ad36c565e..67dddcfdc 100644 --- a/src/xine-engine/io_helper.c +++ b/src/xine-engine/io_helper.c @@ -276,7 +276,7 @@ int _x_io_select (xine_stream_t *stream, int fd, int state, int timeout_msec) { wset = (state & XIO_WRITE_READY) ? &fdset : NULL; ret = select (fd + 1, rset, wset, NULL, &select_timeout); - if (ret == -1) { + if (ret == -1 && errno != EINTR) { /* select error */ return XIO_ERROR; } else if (ret == 1) { |