aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--libmenu/menu_console.c10
-rw-r--r--libmenu/menu_param.c8
2 files changed, 12 insertions, 6 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,
};
diff --git a/libmenu/menu_param.c b/libmenu/menu_param.c
index cad330b312..af8875afd4 100644
--- a/libmenu/menu_param.c
+++ b/libmenu/menu_param.c
@@ -103,19 +103,19 @@ static void free_entry(list_entry_t* entry) {
free(entry);
}
-static void close(menu_t* menu) {
+static void closeMenu(menu_t* menu) {
menu_list_uninit(menu,free_entry);
if(mpriv->edit)
free(mpriv->edit);
}
-static int open(menu_t* menu, char* args) {
+static int openMenu(menu_t* menu, char* args) {
list_entry_t* e;
menu->draw = menu_list_draw;
menu->read_cmd = menu_list_read_cmd;
menu->read_key = read_key;
- menu->close = close;
+ menu->close = closeMenu;
if(!args) {
@@ -155,5 +155,5 @@ const menu_info_t menu_info_pref = {
&cfg_dflt,
cfg_fields
},
- open
+ openMenu
};