Michael Cronenworth : secur32: Provide a static declaration for gnutls_cipher_get_block_size.

Alexandre Julliard julliard at winehq.org
Mon Aug 22 07:32:40 CDT 2016


Module: wine
Branch: stable
Commit: fad28964903e708e3236ebe72c11a6024d349db1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fad28964903e708e3236ebe72c11a6024d349db1

Author: Michael Cronenworth <mike at cchtml.com>
Date:   Thu Jun 16 00:21:13 2016 -0500

secur32: Provide a static declaration for gnutls_cipher_get_block_size.

Instead of providing an extern provide a static declaration. The
function return type changed from signed to unsigned in GnuTLS 3.5.

Signed-off-by: Michael Cronenworth <mike at cchtml.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit bf5ac531a030bce9e798ab66bc53e84a65ca8fdb)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/secur32/schannel_gnutls.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index 95c9bda..4f95e4d 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
 /* Not present in gnutls version < 2.9.10. */
-extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm);
+static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t algorithm);
 
 static void *libgnutls_handle;
 #define MAKE_FUNCPTR(f) static typeof(f) * p##f
@@ -52,7 +52,6 @@ MAKE_FUNCPTR(gnutls_certificate_allocate_credentials);
 MAKE_FUNCPTR(gnutls_certificate_free_credentials);
 MAKE_FUNCPTR(gnutls_certificate_get_peers);
 MAKE_FUNCPTR(gnutls_cipher_get);
-MAKE_FUNCPTR(gnutls_cipher_get_block_size);
 MAKE_FUNCPTR(gnutls_cipher_get_key_size);
 MAKE_FUNCPTR(gnutls_credentials_set);
 MAKE_FUNCPTR(gnutls_deinit);




More information about the wine-cvs mailing list