From 40ec612e731f0ebbf7a7121d0f542e1996c99da3 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Mon, 2 Jun 2008 12:47:27 +0200 Subject: [PATCH] Fix compilation bug when gnutls dev lib is not installed --- src/core/wee-hook.c | 7 +++++++ src/core/wee-network.c | 5 ++++- src/plugins/irc/irc-server.c | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c index 99034c7b2..43ecb6d8f 100644 --- a/src/core/wee-hook.c +++ b/src/core/wee-hook.c @@ -798,6 +798,11 @@ hook_connect (struct t_weechat_plugin *plugin, char *address, int port, struct t_hook *new_hook; struct t_hook_connect *new_hook_connect; +#ifndef HAVE_GNUTLS + /* make C compiler happy */ + (void) gnutls_sess; +#endif + if ((sock < 0) || !address || (port <= 0)) return NULL; @@ -819,7 +824,9 @@ hook_connect (struct t_weechat_plugin *plugin, char *address, int port, new_hook_connect->port = port; new_hook_connect->sock = sock; new_hook_connect->ipv6 = ipv6; +#ifdef HAVE_GNUTLS new_hook_connect->gnutls_sess = gnutls_sess; +#endif new_hook_connect->local_hostname = (local_hostname) ? strdup (local_hostname) : NULL; new_hook_connect->child_read = -1; diff --git a/src/core/wee-network.c b/src/core/wee-network.c index 3bfab7215..50cc63d02 100644 --- a/src/core/wee-network.c +++ b/src/core/wee-network.c @@ -679,7 +679,10 @@ network_connect_child_read_cb (void *arg_hook_connect) { struct t_hook *hook_connect; char buffer[1]; - int num_read, rc; + int num_read; +#ifdef HAVE_GNUTLS + int rc; +#endif hook_connect = (struct t_hook *)arg_hook_connect; diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 9a727bac2..7c36bf550 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -1967,7 +1968,11 @@ irc_server_connect (struct t_irc_server *server, int disable_autojoin) server->ports_array[server->current_address], server->sock, server->ipv6, +#ifdef HAVE_GNUTLS (server->ssl_connected) ? &server->gnutls_sess : NULL, +#else + NULL, +#endif server->local_hostname, irc_server_connect_cb, server);