Ticket #2576: fix of symbols duplication.

dialog_map, input_map and listbox_map variabels are declared and defined twice.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2011-07-14 21:34:55 +04:00
parent 2b10373e02
commit c4b95bcd32
5 changed files with 4 additions and 9 deletions

View File

@ -63,7 +63,7 @@ int fast_refresh = 0;
/* left click outside of dialog closes it */
int mouse_close_dialog = 0;
const global_keymap_t *dialog_map;
const global_keymap_t *dialog_map = NULL;
/*** file scope macro definitions ****************************************************************/

View File

@ -56,7 +56,7 @@
int quote = 0;
const global_keymap_t *input_map;
const global_keymap_t *input_map = NULL;
/*** file scope macro definitions ****************************************************************/

View File

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

View File

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

View File

@ -35,9 +35,6 @@ extern GArray *diff_keymap;
extern const global_keymap_t *main_map;
extern const global_keymap_t *main_x_map;
extern const global_keymap_t *panel_map;
extern const global_keymap_t *dialog_map;
extern const global_keymap_t *input_map;
extern const global_keymap_t *listbox_map;
extern const global_keymap_t *tree_map;
extern const global_keymap_t *help_map;