[MPlayer-cvslog] r18821 - in trunk/libmenu: menu_cmdlist.c menu_pt.c

[ben]

Author: ben
Date: Sun Jun 25 22:59:12 2006
New Revision: 18821

Modified:
   trunk/libmenu/menu_cmdlist.c
   trunk/libmenu/menu_pt.c

Log:
declaring static functions with the same name than libc ones was not the best idea ever

Modified: trunk/libmenu/menu_cmdlist.c
==============================================================================
--- trunk/libmenu/menu_cmdlist.c	(original)
+++ trunk/libmenu/menu_cmdlist.c	Sun Jun 25 22:59:12 2006
@@ -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);

Modified: trunk/libmenu/menu_pt.c
==============================================================================
--- trunk/libmenu/menu_pt.c	(original)
+++ trunk/libmenu/menu_pt.c	Sun Jun 25 22:59:12 2006
@@ -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);