From d74ce809e504f4720d2f399eb84e8e68c3f3f88a Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Tue, 30 Aug 2011 13:27:39 +0300 Subject: [PATCH] Ticket #2576: Duplicate symbols (Linking) problem under Mac OS X Fixed linker error 'duplicate symbol _record_macro_buf' Signed-off-by: Slava Zanko --- src/main.c | 3 +++ src/main.h | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 5f548c71f..59a96a4ba 100644 --- a/src/main.c +++ b/src/main.c @@ -111,6 +111,9 @@ char *last_wd_string = NULL; /* index to record_macro_buf[], -1 if not recording a macro */ int macro_index = -1; +/* macro stuff */ +struct macro_action_t record_macro_buf[MAX_MACRO_LENGTH]; + GArray *macros_list; /*** file scope macro definitions ****************************************************************/ diff --git a/src/main.h b/src/main.h index d0c219700..092467249 100644 --- a/src/main.h +++ b/src/main.h @@ -35,9 +35,6 @@ typedef struct macros_t GArray *macro; } macros_t; -/* macro stuff */ -struct macro_action_t record_macro_buf[MAX_MACRO_LENGTH]; - struct mc_fhl_struct; /*** global variables defined in .c file *********************************************************/ @@ -80,6 +77,9 @@ extern const char *mc_prompt; /* index to record_macro_buf[], -1 if not recording a macro */ extern int macro_index; +/* macro stuff */ +extern struct macro_action_t record_macro_buf[MAX_MACRO_LENGTH]; + extern GArray *macros_list; /*** declarations of public functions ************************************************************/ -- 2.11.4.GIT