diff options
author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-25 20:59:12 +0000 |
---|---|---|
committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-25 20:59:12 +0000 |
commit | be1d649e96f1379b3012a331d0a744f6a6c4b807 (patch) | |
tree | dacf82f120808d6e22e30eeb0e6613d1955b32fd | |
parent | 91ca617cfd6c0885d3c41bad734fa20750e5634d (diff) | |
download | mpv-be1d649e96f1379b3012a331d0a744f6a6c4b807.tar.bz2 mpv-be1d649e96f1379b3012a331d0a744f6a6c4b807.tar.xz |
declaring static functions with the same name than libc ones was not the best idea ever
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18821 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmenu/menu_cmdlist.c | 4 | ||||
-rw-r--r-- | libmenu/menu_pt.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c index 497b7b6d55..57b78e1e14 100644 --- a/libmenu/menu_cmdlist.c +++ b/libmenu/menu_cmdlist.c @@ -95,7 +95,7 @@ static void free_entry(list_entry_t* entry) { free(entry); } -static void close(menu_t* menu) { +static void close_menu(menu_t* menu) { menu_list_uninit(menu,free_entry); } @@ -144,7 +144,7 @@ static int open(menu_t* menu, char* args) { menu->draw = menu_list_draw; menu->read_cmd = read_cmd; menu->read_key = read_key; - menu->close = close; + menu->close = close_menu; if(!args) { mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_ListMenuNeedsAnArgument); diff --git a/libmenu/menu_pt.c b/libmenu/menu_pt.c index 6a1aca0963..a2f5e67455 100644 --- a/libmenu/menu_pt.c +++ b/libmenu/menu_pt.c @@ -100,7 +100,7 @@ static void read_key(menu_t* menu,int c){ menu_list_read_key(menu,c,1); } -static void close(menu_t* menu) { +static void close_menu(menu_t* menu) { menu_list_uninit(menu,NULL); } @@ -112,7 +112,7 @@ static int op(menu_t* menu, char* args) { menu->draw = menu_list_draw; menu->read_cmd = read_cmd; menu->read_key = read_key; - menu->close = close; + menu->close = close_menu; menu_list_init(menu); |