Merge branch '2576_duplicate_symbol'
* 2576_duplicate_symbol: Ticket #2576: Duplicate symbols (Linking) problem under Mac OS X
Этот коммит содержится в:
Коммит
4aebb59549
@ -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 ****************************************************************/
|
||||
|
@ -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 ************************************************************/
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user