summaryrefslogtreecommitdiffstats
path: root/libmenu/menu_console.c
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-13 18:02:20 +0000
committerfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-13 18:02:20 +0000
commit67831d551cd57d5d64bf2efff8b22122e32829b6 (patch)
tree9d5c488c61ceb4054ac96abdb63de3bd8239d184 /libmenu/menu_console.c
parent9f1d1bc466c21137b2e35bac3ca9178db3f5c58a (diff)
downloadmpv-67831d551cd57d5d64bf2efff8b22122e32829b6.tar.bz2
mpv-67831d551cd57d5d64bf2efff8b22122e32829b6.tar.xz
make menu work on mingw (run command is still disabled), based on patch by Christophe Perinaud
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10865 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu/menu_console.c')
-rw-r--r--libmenu/menu_console.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c
index 2b010cb231..1c4308c862 100644
--- a/libmenu/menu_console.c
+++ b/libmenu/menu_console.c
@@ -7,7 +7,9 @@
#include <ctype.h>
#include <sys/time.h>
#include <sys/types.h>
+#ifndef __MINGW32__
#include <sys/wait.h>
+#endif
#include <unistd.h>
#include <errno.h>
@@ -223,6 +225,7 @@ static void read_cmd(menu_t* menu,int cmd) {
}
static void check_child(menu_t* menu) {
+#ifndef __MINGW32__
fd_set rfd;
struct timeval tv;
int max_fd = mpriv->child_fd[2] > mpriv->child_fd[1] ? mpriv->child_fd[2] :
@@ -268,12 +271,14 @@ static void check_child(menu_t* menu) {
w = 1;
}
}
+#endif
}
#define close_pipe(pipe) close(pipe[0]); close(pipe[1])
static int run_shell_cmd(menu_t* menu, char* cmd) {
+#ifndef __MINGW32__
int in[2],out[2],err[2];
printf("Console run %s ...\n",cmd);
@@ -311,6 +316,7 @@ static int run_shell_cmd(menu_t* menu, char* cmd) {
mpriv->child_fd[2] = err[0];
mpriv->prompt = mpriv->child_prompt;
//add_line(mpriv,"Child process started");
+#endif
return 1;
}
@@ -439,7 +445,7 @@ static void read_key(menu_t* menu,int c) {
}
-static int open(menu_t* menu, char* args) {
+static int openMenu(menu_t* menu, char* args) {
menu->draw = draw;
@@ -469,5 +475,5 @@ const menu_info_t menu_info_console = {
&cfg_dflt,
cfg_fields
},
- open,
+ openMenu,
};