aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Fix compilation of irc/core on AIX and IBM i

Browse Source 
There's a function in the standard library of these OSes that conflict
with this function. Prefix it with `irc_`.
This commit is contained in:
Calvin Buckley 2018-11-19 13:58:51 +00:00
parent 6c40567dab
commit 4380f3820e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/irc/core/irc-cap.c
View File

@ -296,7 +296,7 @@ static void event_invalid_cap (IRC_SERVER_REC *server, const char *data, const c
irc_send_cmd_now(server, "CAP END"); irc_send_cmd_now(server, "CAP END");
} }
void cap_init (void) void irc_cap_init (void)
{ {
signal_add_first("event cap", (SIGNAL_FUNC) event_cap); signal_add_first("event cap", (SIGNAL_FUNC) event_cap);
signal_add_first("event 410", (SIGNAL_FUNC) event_invalid_cap); signal_add_first("event 410", (SIGNAL_FUNC) event_invalid_cap);

3
src/irc/core/irc-cap.h
View File

@ -1,7 +1,8 @@
#ifndef __IRC_CAP_H #ifndef __IRC_CAP_H
#define __IRC_CAP_H #define __IRC_CAP_H
void cap_init(void); /* this is prefixed as to not conflict with an AIX/i function in their stdlib */
void irc_cap_init(void);
void cap_deinit(void); void cap_deinit(void);
int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable); int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable);
void cap_finish_negotiation (IRC_SERVER_REC *server); void cap_finish_negotiation (IRC_SERVER_REC *server);

2
src/irc/core/irc-core.c
View File

@ -119,7 +119,7 @@ void irc_core_init(void)
lag_init(); lag_init();
netsplit_init(); netsplit_init();
irc_expandos_init(); irc_expandos_init();
cap_init(); irc_cap_init();
sasl_init(); sasl_init();
settings_check(); settings_check();