[gnutls-dev] [PATCH] gnutls.h fixes

[Joe Orton]

* includes/gnutls/gnutls.h.in (gnutls_session_get_data2): Add missing
prototype.
(gnutls_global_set_mem_functions): Rename alloc_func and free_func 
parameter names to avoid gcc warnings from shadowing zlib.h's types
of same.

--- includes/gnutls/gnutls.h.in.orig    2005-11-29 22:41:32.000000000 +0000
+++ includes/gnutls/gnutls.h.in 2005-11-29 22:40:13.000000000 +0000
@@ -326,6 +326,7 @@
  */
 int gnutls_session_set_data( gnutls_session_t session, const void* 
session_data, size_t session_data_size);
 int gnutls_session_get_data( gnutls_session_t session, void* session_data, 
size_t *session_data_size);
+int gnutls_session_get_data2(gnutls_session_t session, gnutls_datum *data);
 
 /* returns the session ID */
 #define GNUTLS_MAX_SESSION_ID 32
@@ -451,11 +452,11 @@
 typedef void* (*gnutls_realloc_function)(void*, size_t);
 
 extern void
-gnutls_global_set_mem_functions(gnutls_alloc_function alloc_func,
+gnutls_global_set_mem_functions(gnutls_alloc_function galloc_func,
                                gnutls_alloc_function secure_alloc_func,
                                gnutls_is_secure_function is_secure_func,
                                gnutls_realloc_function realloc_func,
-                               gnutls_free_function free_func);
+                               gnutls_free_function gfree_func);
 
 /* For use in callbacks */
 extern gnutls_alloc_function gnutls_malloc;