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

compile fix for glib2

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3148 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2003-11-16 18:00:23 +00:00 committed by cras
parent d6fe016c78
commit 0ece10f26a
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/core/network-openssl.c
View File

@ -54,29 +54,6 @@ static void irssi_ssl_free(GIOChannel *handle)
g_free(chan); g_free(chan);
} }
#if GLIB_MAJOR_VERSION < 2
#ifdef G_CAN_INLINE
G_INLINE_FUNC
#else
static
#endif
GIOError ssl_errno(gint e)
{
switch(e)
{
case EINVAL:
return G_IO_ERROR_INVAL;
case EINTR:
case EAGAIN:
return G_IO_ERROR_AGAIN;
default:
return G_IO_ERROR_INVAL;
}
/*UNREACH*/
return G_IO_ERROR_INVAL;
}
static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, X509 *cert) static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, X509 *cert)
{ {
if (SSL_get_verify_result(ssl) != X509_V_OK) { if (SSL_get_verify_result(ssl) != X509_V_OK) {
@ -117,6 +94,30 @@ static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, X509 *cert)
return TRUE; return TRUE;
} }
#if GLIB_MAJOR_VERSION < 2
#ifdef G_CAN_INLINE
G_INLINE_FUNC
#else
static
#endif
GIOError ssl_errno(gint e)
{
switch(e)
{
case EINVAL:
return G_IO_ERROR_INVAL;
case EINTR:
case EAGAIN:
return G_IO_ERROR_AGAIN;
default:
return G_IO_ERROR_INVAL;
}
/*UNREACH*/
return G_IO_ERROR_INVAL;
}
static GIOError irssi_ssl_cert_step(GIOSSLChannel *chan) static GIOError irssi_ssl_cert_step(GIOSSLChannel *chan)
{ {
X509 *cert; X509 *cert;