summaryrefslogtreecommitdiff
path: root/src/plugins/irc/irc-server.c
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2015-01-21 07:50:54 +0100
committerSébastien Helleu <flashcode@flashtux.org>2015-01-21 07:50:54 +0100
commitb0117f0d18ec9ffea9eba5c4b00ef101ecfb7e15 (patch)
tree0eb461bf12364ab5c2a65f45e33be209214ee145 /src/plugins/irc/irc-server.c
parentb30ad7d7f600a3d36046bf1d8006ddc96dd778bf (diff)
downloadweechat-b0117f0d18ec9ffea9eba5c4b00ef101ecfb7e15.zip
core: add gnutls version in #if compiler directives
Diffstat (limited to 'src/plugins/irc/irc-server.c')
-rw-r--r--src/plugins/irc/irc-server.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index cd576b606..c7507f10c 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -3807,7 +3807,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
const gnutls_datum_t *req_ca, int nreq,
const gnutls_pk_algorithm_t *pk_algos,
int pk_algos_len,
-#if LIBGNUTLS_VERSION_NUMBER >= 0x020b00
+#if LIBGNUTLS_VERSION_NUMBER >= 0x020b00 /* 2.11.0 */
gnutls_retr2_st *answer,
#else
gnutls_retr_st *answer,
@@ -3815,7 +3815,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
int action)
{
struct t_irc_server *server;
-#if LIBGNUTLS_VERSION_NUMBER >= 0x020b00
+#if LIBGNUTLS_VERSION_NUMBER >= 0x020b00 /* 2.11.0 */
gnutls_retr2_st tls_struct;
#else
gnutls_retr_st tls_struct;
@@ -3828,7 +3828,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
char *cert_path0, *cert_path1, *cert_path2, *cert_str;
const char *weechat_dir, *fingerprint;
int rc, ret, fingerprint_match, hostname_match, cert_temp_init;
-#if LIBGNUTLS_VERSION_NUMBER >= 0x010706
+#if LIBGNUTLS_VERSION_NUMBER >= 0x010706 /* 1.7.6 */
gnutls_datum_t cinfo;
int rinfo;
#endif
@@ -3923,9 +3923,9 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
hostname_match = 1;
}
}
-#if LIBGNUTLS_VERSION_NUMBER >= 0x010706
+#if LIBGNUTLS_VERSION_NUMBER >= 0x010706 /* 1.7.6 */
/* display infos about certificate */
-#if LIBGNUTLS_VERSION_NUMBER < 0x020400
+#if LIBGNUTLS_VERSION_NUMBER < 0x020400 /* 2.4.0 */
rinfo = gnutls_x509_crt_print (cert_temp,
GNUTLS_X509_CRT_ONELINE, &cinfo);
#else
@@ -4113,7 +4113,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
else
{
-#if LIBGNUTLS_VERSION_NUMBER >= 0x020b00
+#if LIBGNUTLS_VERSION_NUMBER >= 0x020b00 /* 2.11.0 */
tls_struct.cert_type = GNUTLS_CRT_X509;
tls_struct.key_type = GNUTLS_PRIVKEY_X509;
#else
@@ -4123,9 +4123,9 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
tls_struct.deinit_all = 0;
tls_struct.cert.x509 = &server->tls_cert;
tls_struct.key.x509 = server->tls_cert_key;
-#if LIBGNUTLS_VERSION_NUMBER >= 0x010706
+#if LIBGNUTLS_VERSION_NUMBER >= 0x010706 /* 1.7.6 */
/* client certificate info */
-#if LIBGNUTLS_VERSION_NUMBER < 0x020400
+#if LIBGNUTLS_VERSION_NUMBER < 0x020400 /* 2.4.0 */
rinfo = gnutls_x509_crt_print (server->tls_cert,
GNUTLS_X509_CRT_ONELINE,
&cinfo);