summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-05-04 18:51:36 +0300
committerUoti Urpala <uau@mplayer2.org>2011-05-04 18:53:17 +0300
commit618f760866441a01051a0177529c7524082f4e37 (patch)
treef93381a89eb9a1a173b6a7f156ab7b719809c0fe /osdep
parent0fff1380b18f4f695d0481fd0cb0e19e1991140a (diff)
downloadmpv-618f760866441a01051a0177529c7524082f4e37.tar.bz2
mpv-618f760866441a01051a0177529c7524082f4e37.tar.xz
input: make slave command file descriptors nonblocking
Neither fd 0 slave input (-slave) nor additional opened fds (-input file=X) were set to nonblocking mode as they should have been. Fix. Also rename the horribly generic USE_SELECT #define used for a specific slave input detail.
Diffstat (limited to 'osdep')
-rw-r--r--osdep/getch2.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/osdep/getch2.h b/osdep/getch2.h
index 7ee40d9e98..8fb346d4f7 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -61,10 +61,10 @@ char *get_term_charset(void);
#if defined(__MINGW32__) || defined(__OS2__)
/* slave cmd function for Windows and OS/2 */
int mp_input_slave_cmd_func(int fd,char* dest,int size);
-#define USE_SELECT 0
+#define USE_FD0_CMD_SELECT 0
#define MP_INPUT_SLAVE_CMD_FUNC mp_input_slave_cmd_func
#else
-#define USE_SELECT 1
+#define USE_FD0_CMD_SELECT 1
#define MP_INPUT_SLAVE_CMD_FUNC NULL
#endif