mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #4035: fix compile failure on OS X 10.9.

Browse Source 
Fix duplication of menu_map definition.

Move menu_map definition to lib/widget/menu.c.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2019-11-23 17:41:58 +03:00
parent e022f5f4e5
commit 093571938a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/widget/menu.c
View File

@ -46,7 +46,7 @@
/*** global variables ****************************************************************************/ /*** global variables ****************************************************************************/
const global_keymap_t *menu_map; const global_keymap_t *menu_map = NULL;
/*** file scope macro definitions ****************************************************************/ /*** file scope macro definitions ****************************************************************/

2
lib/widget/menu.h
View File

@ -39,6 +39,8 @@ typedef struct WMenuBar
/*** global variables defined in .c file *********************************************************/ /*** global variables defined in .c file *********************************************************/
extern const global_keymap_t *menu_map;
/*** declarations of public functions ************************************************************/ /*** declarations of public functions ************************************************************/
menu_entry_t *menu_entry_create (const char *name, long command); menu_entry_t *menu_entry_create (const char *name, long command);

3
src/keybind-defaults.c
View File

@ -28,7 +28,7 @@
#include <config.h> #include <config.h>
#include "lib/global.h" #include "lib/global.h"
#include "lib/widget.h" /* dialog_map, input_map, listbox_map */ #include "lib/widget.h" /* dialog_map, input_map, listbox_map, menu_map */
#include "keybind-defaults.h" #include "keybind-defaults.h"
@ -56,7 +56,6 @@ GArray *diff_keymap = NULL;
const global_keymap_t *main_map = NULL; const global_keymap_t *main_map = NULL;
const global_keymap_t *main_x_map = NULL; const global_keymap_t *main_x_map = NULL;
const global_keymap_t *panel_map = NULL; const global_keymap_t *panel_map = NULL;
const global_keymap_t *menu_map = NULL;
const global_keymap_t *tree_map = NULL; const global_keymap_t *tree_map = NULL;
const global_keymap_t *help_map = NULL; const global_keymap_t *help_map = NULL;

1
src/keybind-defaults.h
View File

@ -35,7 +35,6 @@ extern GArray *diff_keymap;
extern const global_keymap_t *main_map; extern const global_keymap_t *main_map;
extern const global_keymap_t *main_x_map; extern const global_keymap_t *main_x_map;
extern const global_keymap_t *panel_map; extern const global_keymap_t *panel_map;
extern const global_keymap_t *menu_map;
extern const global_keymap_t *tree_map; extern const global_keymap_t *tree_map;
extern const global_keymap_t *help_map; extern const global_keymap_t *help_map;