Mercurial > mplayer.hg
changeset 23366:b344b6520518
rename some menu open functions, to avoid confusion with libc native open()
| author | ben |
|---|---|
| date | Fri, 25 May 2007 10:26:39 +0000 |
| parents | 84eaacdc380d |
| children | ee2c8684c925 |
| files | libmenu/menu_cmdlist.c libmenu/menu_txt.c libmenu/vf_menu.c |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libmenu/menu_cmdlist.c Fri May 25 02:52:35 2007 +0000 +++ b/libmenu/menu_cmdlist.c Fri May 25 10:26:39 2007 +0000 @@ -149,7 +149,7 @@ } } -static int open(menu_t* menu, char* args) { +static int open_cmdlist(menu_t* menu, char* args) { menu->draw = menu_list_draw; menu->read_cmd = read_cmd; menu->read_key = read_key; @@ -177,5 +177,5 @@ &cfg_dflt, cfg_fields }, - open + open_cmdlist };
--- a/libmenu/menu_txt.c Fri May 25 02:52:35 2007 +0000 +++ b/libmenu/menu_txt.c Fri May 25 10:26:39 2007 +0000 @@ -118,7 +118,7 @@ #define BUF_SIZE 1024 -static int open(menu_t* menu, char* args) { +static int open_txt(menu_t* menu, char* args) { FILE* fd; char buf[BUF_SIZE]; char *l; @@ -192,5 +192,5 @@ &cfg_dflt, cfg_fields }, - open, + open_txt, };
--- a/libmenu/vf_menu.c Fri May 25 02:52:35 2007 +0000 +++ b/libmenu/vf_menu.c Fri May 25 10:26:39 2007 +0000 @@ -280,7 +280,7 @@ return (vf_next_query_format(vf,fmt)); } -static int open(vf_instance_t *vf, char* args){ +static int open_vf(vf_instance_t *vf, char* args){ if(!st_priv) { st_priv = calloc(1,sizeof(struct vf_priv_s)); st_priv->root = st_priv->current = menu_open(args); @@ -310,7 +310,7 @@ "menu", "Albeu", "", - open, + open_vf, NULL };