1
1

Merge branch '2576_duplicate_symbol'

* 2576_duplicate_symbol:
  Ticket #2576: Duplicate symbols (Linking) problem under Mac OS X
Этот коммит содержится в:
Slava Zanko 2011-08-30 18:19:16 +03:00
родитель f65f5da0f2 d74ce809e5
Коммит 4aebb59549
2 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -111,6 +111,9 @@ char *last_wd_string = NULL;
/* index to record_macro_buf[], -1 if not recording a macro */ /* index to record_macro_buf[], -1 if not recording a macro */
int macro_index = -1; int macro_index = -1;
/* macro stuff */
struct macro_action_t record_macro_buf[MAX_MACRO_LENGTH];
GArray *macros_list; GArray *macros_list;
/*** file scope macro definitions ****************************************************************/ /*** file scope macro definitions ****************************************************************/

Просмотреть файл

@ -35,9 +35,6 @@ typedef struct macros_t
GArray *macro; GArray *macro;
} macros_t; } macros_t;
/* macro stuff */
struct macro_action_t record_macro_buf[MAX_MACRO_LENGTH];
struct mc_fhl_struct; struct mc_fhl_struct;
/*** global variables defined in .c file *********************************************************/ /*** 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 */ /* index to record_macro_buf[], -1 if not recording a macro */
extern int macro_index; extern int macro_index;
/* macro stuff */
extern struct macro_action_t record_macro_buf[MAX_MACRO_LENGTH];
extern GArray *macros_list; extern GArray *macros_list;
/*** declarations of public functions ************************************************************/ /*** declarations of public functions ************************************************************/