# HG changeset patch # User ben # Date 1151269152 0 # Node ID a2b064a4877557d7cb44f095d85f360accde54a1 # Parent be4e5d19a5b3f7c2ac1a30fbe42b2bef5ffa7fd9 declaring static functions with the same name than libc ones was not the best idea ever diff -r be4e5d19a5b3 -r a2b064a48775 libmenu/menu_cmdlist.c --- a/libmenu/menu_cmdlist.c Sun Jun 25 17:37:58 2006 +0000 +++ b/libmenu/menu_cmdlist.c Sun Jun 25 20:59:12 2006 +0000 @@ -95,7 +95,7 @@ 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 @@ 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 -r be4e5d19a5b3 -r a2b064a48775 libmenu/menu_pt.c --- a/libmenu/menu_pt.c Sun Jun 25 17:37:58 2006 +0000 +++ b/libmenu/menu_pt.c Sun Jun 25 20:59:12 2006 +0000 @@ -100,7 +100,7 @@ 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 @@ 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);