Updating branch refs/heads/master
to 5c19dd14a41032594c00fd222de705c76a79c0ec (commit)
from e19717d627b4750188381d22281ad0f8b5b3bc12 (commit)
commit 5c19dd14a41032594c00fd222de705c76a79c0ec
Author: Ján Sučan <su...@runbox.com>
Date: Mon Aug 26 12:20:25 2013 +0200
Fix compilation error when using gnutls >= 3.0.3
The gnutls_transport_set_lowat() function is now compiled
conditionally according to the used version of gnutls.
This function has been deprecated since gnutls >= 2.12.0 and it has
been removed since gnutls >= 3.0.3.
libmailwatch-core/mailwatch-net-conn.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libmailwatch-core/mailwatch-net-conn.c
b/libmailwatch-core/mailwatch-net-conn.c
index d3662e8..dc3786b 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -623,9 +623,11 @@ xfce_mailwatch_net_conn_make_secure(XfceMailwatchNetConn
*net_conn,
net_conn->gt_creds);
gnutls_transport_set_ptr(net_conn->gt_session,
(gnutls_transport_ptr_t)net_conn->fd);
+#if GNUTLS_VERSION_NUMBER < 0x020c00
if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
gnutls_transport_set_lowat(net_conn->gt_session, 0);
-
+#endif
+
if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
#if 0
gnutls_bye(net_conn->gt_session, GNUTLS_SHUT_RDWR);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
