diff options
Diffstat (limited to 'src')
38 files changed, 37 insertions, 5 deletions
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index 6a0d078c..768fd540 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -477,7 +477,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_ } SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback); - SSL_CTX_set_default_passwd_cb_userdata(ctx, mypass); + SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass); if (mycert && *mycert) { char *scert = NULL, *spkey = NULL; diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c index c29db9e6..bd6ae5e9 100644 --- a/src/fe-common/core/window-items.c +++ b/src/fe-common/core/window-items.c @@ -211,7 +211,6 @@ void window_item_next(WINDOW_REC *window) WI_ITEM_REC *window_item_find_window(WINDOW_REC *window, void *server, const char *name) { - CHANNEL_REC *channel; GSList *tmp; for (tmp = window->items; tmp != NULL; tmp = tmp->next) { diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c index e48c99c6..c5726124 100644 --- a/src/fe-common/irc/fe-whois.c +++ b/src/fe-common/irc/fe-whois.c @@ -242,7 +242,7 @@ static void hide_safe_channel_id(IRC_SERVER_REC *server, char *chans) if (idchan == NULL) return; } - nick_flags = server->get_nick_flags(server); + nick_flags = server->get_nick_flags(SERVER(server)); while (*idchan != '\0') { id = *idchan; diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c index 3c50e312..bcb0a122 100644 --- a/src/irc/core/irc-session.c +++ b/src/irc/core/irc-session.c @@ -115,7 +115,6 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel, { const char *nick, *prefixes; int op, halfop, voice; - NICK_REC *nickrec; char newprefixes[MAX_USER_PREFIXES + 1]; int i; @@ -145,7 +144,7 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel, newprefixes[i] = '\0'; prefixes = newprefixes; } - nickrec = irc_nicklist_insert(channel, nick, op, halfop, voice, FALSE, prefixes); + irc_nicklist_insert(channel, nick, op, halfop, voice, FALSE, prefixes); } static void session_restore_channel(IRC_CHANNEL_REC *channel) diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c index 5dfd46db..8edffbd3 100644 --- a/src/irc/proxy/listen.c +++ b/src/irc/proxy/listen.c @@ -24,6 +24,7 @@ #include "servers-redirect.h" #include "levels.h" #include "settings.h" +#include "misc.h" #include "irc.h" #include "irc-channels.h" diff --git a/src/perl/common/Channel.xs b/src/perl/common/Channel.xs index 0692a7cc..69141c7c 100644 --- a/src/perl/common/Channel.xs +++ b/src/perl/common/Channel.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Channel PACKAGE = Irssi diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs index 3358f5eb..bfe2efde 100644 --- a/src/perl/common/Core.xs +++ b/src/perl/common/Core.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" #include "irssi-version.h" #include "core.h" diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs index 10d85d24..375a4c2f 100644 --- a/src/perl/common/Expando.xs +++ b/src/perl/common/Expando.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" #include "expandos.h" diff --git a/src/perl/common/Ignore.xs b/src/perl/common/Ignore.xs index e4452c78..8dfd0ad3 100644 --- a/src/perl/common/Ignore.xs +++ b/src/perl/common/Ignore.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Ignore PACKAGE = Irssi diff --git a/src/perl/common/Irssi.xs b/src/perl/common/Irssi.xs index 9f33d557..dc354bbd 100644 --- a/src/perl/common/Irssi.xs +++ b/src/perl/common/Irssi.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" static int initialized = FALSE; diff --git a/src/perl/common/Log.xs b/src/perl/common/Log.xs index c87ee45b..cdcdbd90 100644 --- a/src/perl/common/Log.xs +++ b/src/perl/common/Log.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Log PACKAGE = Irssi diff --git a/src/perl/common/Masks.xs b/src/perl/common/Masks.xs index 1ea13969..9612911a 100644 --- a/src/perl/common/Masks.xs +++ b/src/perl/common/Masks.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Masks PACKAGE = Irssi diff --git a/src/perl/common/Query.xs b/src/perl/common/Query.xs index 54a0582c..9d8cd523 100644 --- a/src/perl/common/Query.xs +++ b/src/perl/common/Query.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Query PACKAGE = Irssi diff --git a/src/perl/common/Rawlog.xs b/src/perl/common/Rawlog.xs index dd95ce50..c405bc37 100644 --- a/src/perl/common/Rawlog.xs +++ b/src/perl/common/Rawlog.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Rawlog PACKAGE = Irssi diff --git a/src/perl/common/Server.xs b/src/perl/common/Server.xs index 76ea7812..7ed41109 100644 --- a/src/perl/common/Server.xs +++ b/src/perl/common/Server.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Server PACKAGE = Irssi diff --git a/src/perl/common/Settings.xs b/src/perl/common/Settings.xs index dc5507cf..eb81b627 100644 --- a/src/perl/common/Settings.xs +++ b/src/perl/common/Settings.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" #include "misc.h" diff --git a/src/perl/irc/Channel.xs b/src/perl/irc/Channel.xs index 828e8cca..782fa1d5 100644 --- a/src/perl/irc/Channel.xs +++ b/src/perl/irc/Channel.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Irc::Channel PACKAGE = Irssi::Irc PREFIX = irc_ diff --git a/src/perl/irc/Client.xs b/src/perl/irc/Client.xs index 8481a11e..05616af2 100644 --- a/src/perl/irc/Client.xs +++ b/src/perl/irc/Client.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Irc::Client PACKAGE = Irssi::Irc diff --git a/src/perl/irc/Ctcp.xs b/src/perl/irc/Ctcp.xs index f298a2a4..d1bf8ba4 100644 --- a/src/perl/irc/Ctcp.xs +++ b/src/perl/irc/Ctcp.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" #include "ctcp.h" diff --git a/src/perl/irc/Dcc.xs b/src/perl/irc/Dcc.xs index eff4e982..c078a1b5 100644 --- a/src/perl/irc/Dcc.xs +++ b/src/perl/irc/Dcc.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Irc::Dcc PACKAGE = Irssi::Irc diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs index 251efb8b..22a87384 100644 --- a/src/perl/irc/Irc.xs +++ b/src/perl/irc/Irc.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" static int initialized = FALSE; diff --git a/src/perl/irc/Modes.xs b/src/perl/irc/Modes.xs index 4f355ce0..a53391b3 100644 --- a/src/perl/irc/Modes.xs +++ b/src/perl/irc/Modes.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Irc::Modes PACKAGE = Irssi::Irc diff --git a/src/perl/irc/Netsplit.xs b/src/perl/irc/Netsplit.xs index b0b1e523..9fafaf74 100644 --- a/src/perl/irc/Netsplit.xs +++ b/src/perl/irc/Netsplit.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Irc::Netsplit PACKAGE = Irssi::Irc::Server diff --git a/src/perl/irc/Notifylist.xs b/src/perl/irc/Notifylist.xs index 192489cc..74747baa 100644 --- a/src/perl/irc/Notifylist.xs +++ b/src/perl/irc/Notifylist.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Irc::Notifylist PACKAGE = Irssi::Irc diff --git a/src/perl/irc/Query.xs b/src/perl/irc/Query.xs index a4f6bd03..e873d9a5 100644 --- a/src/perl/irc/Query.xs +++ b/src/perl/irc/Query.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::Irc::Query PACKAGE = Irssi::Irc::Server PREFIX = irc_ diff --git a/src/perl/irc/Server.xs b/src/perl/irc/Server.xs index 854a2a54..0e9ec672 100644 --- a/src/perl/irc/Server.xs +++ b/src/perl/irc/Server.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" static GSList *register_hash2list(HV *hv) diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c index a1b04b11..c5037ba6 100644 --- a/src/perl/perl-common.c +++ b/src/perl/perl-common.c @@ -19,6 +19,7 @@ */ #define NEED_PERL_H +#define PERL_NO_GET_CONTEXT #include "module.h" #include "modules.h" #include "signals.h" diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c index 226be969..3b00ce18 100644 --- a/src/perl/perl-core.c +++ b/src/perl/perl-core.c @@ -19,6 +19,7 @@ */ #define NEED_PERL_H +#define PERL_NO_GET_CONTEXT #include "module.h" #include "modules.h" #include "core.h" diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c index cca989e9..d0670ba2 100644 --- a/src/perl/perl-signals.c +++ b/src/perl/perl-signals.c @@ -19,6 +19,7 @@ */ #define NEED_PERL_H +#define PERL_NO_GET_CONTEXT #include "module.h" #include "modules.h" #include "signals.h" diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c index fddaa995..33fe6dd1 100644 --- a/src/perl/perl-sources.c +++ b/src/perl/perl-sources.c @@ -19,6 +19,7 @@ */ #define NEED_PERL_H +#define PERL_NO_GET_CONTEXT #include "module.h" #include "signals.h" diff --git a/src/perl/textui/Statusbar.xs b/src/perl/textui/Statusbar.xs index 3fc43632..d1241ae1 100644 --- a/src/perl/textui/Statusbar.xs +++ b/src/perl/textui/Statusbar.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" static GHashTable *perl_sbar_defs; diff --git a/src/perl/textui/TextBuffer.xs b/src/perl/textui/TextBuffer.xs index 0a0fe0d1..14ef5950 100644 --- a/src/perl/textui/TextBuffer.xs +++ b/src/perl/textui/TextBuffer.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::TextUI::TextBuffer PACKAGE = Irssi diff --git a/src/perl/textui/TextBufferView.xs b/src/perl/textui/TextBufferView.xs index 4d755494..6e49e453 100644 --- a/src/perl/textui/TextBufferView.xs +++ b/src/perl/textui/TextBufferView.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" MODULE = Irssi::TextUI::TextBufferView PACKAGE = Irssi::TextUI::TextBuffer PREFIX = textbuffer_ diff --git a/src/perl/textui/TextUI.xs b/src/perl/textui/TextUI.xs index 84320ffa..fe51076a 100644 --- a/src/perl/textui/TextUI.xs +++ b/src/perl/textui/TextUI.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" void perl_statusbar_init(void); diff --git a/src/perl/ui/Formats.xs b/src/perl/ui/Formats.xs index c16aa5a0..c10f0b4e 100644 --- a/src/perl/ui/Formats.xs +++ b/src/perl/ui/Formats.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" static int magic_free_text_dest(pTHX_ SV *sv, MAGIC *mg) diff --git a/src/perl/ui/Themes.xs b/src/perl/ui/Themes.xs index 772b25db..dc5f6272 100644 --- a/src/perl/ui/Themes.xs +++ b/src/perl/ui/Themes.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" static void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist) diff --git a/src/perl/ui/UI.xs b/src/perl/ui/UI.xs index d8c7f7ae..2e32762c 100644 --- a/src/perl/ui/UI.xs +++ b/src/perl/ui/UI.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" void perl_themes_init(void); diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs index ea3735a6..8c994cc2 100644 --- a/src/perl/ui/Window.xs +++ b/src/perl/ui/Window.xs @@ -1,3 +1,4 @@ +#define PERL_NO_GET_CONTEXT #include "module.h" #include "window-activity.h" |