X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_socket.c;h=acb544afe133cd878dd63190eba7e87b0ac10669;hp=4c3baaa232141cbbdb9cd289c02db43986453780;hb=7480539010bab6905c944b11b036492a1a625994;hpb=96d53ff49c308769efbf708e1e65819077cb7af6 diff --git a/mutt_socket.c b/mutt_socket.c index 4c3baaa..acb544a 100644 --- a/mutt_socket.c +++ b/mutt_socket.c @@ -17,7 +17,7 @@ #include "globals.h" #include "mutt_socket.h" #include "mutt_tunnel.h" -#if defined(USE_SSL) || defined(USE_GNUTLS) || defined(USE_NSS) +#if defined(USE_SSL) || defined(USE_GNUTLS) # include "mutt_ssl.h" #endif @@ -44,7 +44,7 @@ static CONNECTION *Connections = NULL; /* forward declarations */ static int socket_preconnect (void); static int socket_connect (int fd, struct sockaddr *sa); -static CONNECTION *socket_new_conn (); +static CONNECTION *socket_new_conn (void); /* Wrappers */ int mutt_socket_open (CONNECTION * conn) @@ -239,8 +239,6 @@ CONNECTION *mutt_conn_find (const CONNECTION * start, const ACCOUNT * account) else if (account->flags & M_ACCT_SSL) { #ifdef USE_SSL ssl_socket_setup (conn); -#elif USE_NSS - mutt_nss_socket_setup (conn); #elif USE_GNUTLS if (mutt_gnutls_socket_setup (conn) < 0) { mutt_socket_free (conn); @@ -324,7 +322,7 @@ static int socket_connect (int fd, struct sockaddr *sa) } /* socket_new_conn: allocate and initialise a new connection. */ -static CONNECTION *socket_new_conn () +static CONNECTION *socket_new_conn (void) { CONNECTION *conn;