From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 2 Feb 2017 10:26:18 +0000 (+0100)
Subject: gnutls_heartbeat_allowed: corrected type on dummy wrapper
X-Git-Tag: gnutls_3_6_0~1024
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e17f6c8d26d745751df4432bcf9eea1d1bf1732d;p=thirdparty%2Fgnutls.git

gnutls_heartbeat_allowed: corrected type on dummy wrapper

That is, when compiling without heartbeat support, compilation
could fail due to the dummy wrapper not returning the right
type.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---

diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c
index 930d35026b..c459bfa779 100644
--- a/lib/ext/heartbeat.c
+++ b/lib/ext/heartbeat.c
@@ -538,7 +538,7 @@ void gnutls_heartbeat_enable(gnutls_session_t session, unsigned int type)
 {
 }
 
-int gnutls_heartbeat_allowed(gnutls_session_t session, unsigned int type)
+unsigned gnutls_heartbeat_allowed(gnutls_session_t session, unsigned int type)
 {
 	return 0;
 }