aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-12-13 18:58:08 +0200
committerEli Zaretskii2014-12-13 18:58:08 +0200
commitd9005dd52df70e84d8807869173f95e59952a88b (patch)
treeb844600bd3b0a412983cbe4ae5b1b8434ab2cae6 /src
parentbd6c441893b918122cf920a1ecdb820e3a83ec1a (diff)
downloademacs-d9005dd52df70e84d8807869173f95e59952a88b.tar.gz
emacs-d9005dd52df70e84d8807869173f95e59952a88b.zip
src/gnutls.c (gnutls_init): Fix deprecation warning from GCC.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gnutls.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f8790a66d32..6b7abe46eea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-12-13 Eli Zaretskii <eliz@gnu.org>
2
3 * gnutls.c (gnutls_init): Fix deprecation warning from GCC.
4
12014-12-12 Eli Zaretskii <eliz@gnu.org> 52014-12-12 Eli Zaretskii <eliz@gnu.org>
2 6
3 * gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move 7 * gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move
diff --git a/src/gnutls.c b/src/gnutls.c
index 247e5c42d48..ffa3c982572 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -121,7 +121,7 @@ DEF_GNUTLS_FN (void, gnutls_global_set_mem_functions,
121 gnutls_is_secure_function, gnutls_realloc_function, 121 gnutls_is_secure_function, gnutls_realloc_function,
122 gnutls_free_function)); 122 gnutls_free_function));
123DEF_GNUTLS_FN (int, gnutls_handshake, (gnutls_session_t)); 123DEF_GNUTLS_FN (int, gnutls_handshake, (gnutls_session_t));
124DEF_GNUTLS_FN (int, gnutls_init, (gnutls_session_t *, gnutls_connection_end_t)); 124DEF_GNUTLS_FN (int, gnutls_init, (gnutls_session_t *, unsigned int));
125DEF_GNUTLS_FN (int, gnutls_priority_set_direct, 125DEF_GNUTLS_FN (int, gnutls_priority_set_direct,
126 (gnutls_session_t, const char *, const char **)); 126 (gnutls_session_t, const char *, const char **));
127DEF_GNUTLS_FN (size_t, gnutls_record_check_pending, (gnutls_session_t)); 127DEF_GNUTLS_FN (size_t, gnutls_record_check_pending, (gnutls_session_t));