aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndy Moreton2014-12-09 19:16:55 +0200
committerEli Zaretskii2014-12-09 19:16:55 +0200
commit9b185aa1ae060025f5479cf8d6d64548aff8dbe3 (patch)
treed8d3e9bd0d6614e4fc62578b5d6693a4964396c8 /src
parentfda355b5bd8330762cb7894fc038492c6c9720a1 (diff)
downloademacs-9b185aa1ae060025f5479cf8d6d64548aff8dbe3.tar.gz
emacs-9b185aa1ae060025f5479cf8d6d64548aff8dbe3.zip
gnutls.c (gnutls_protocol_get_name): Fix a copy/paste typo.
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 b65fbb5c1eb..762ce486390 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-12-09 Andy Moreton <andrewjmoreton@gmail.com> (tiny change)
2
3 * gnutls.c (gnutls_protocol_get_name): Fix a copy/paste typo.
4
12014-12-08 Lars Magne Ingebrigtsen <larsi@gnus.org> 52014-12-08 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * gnutls.c (Fgnutls_peer_status): Return the key exchange, cipher 7 * gnutls.c (Fgnutls_peer_status): Return the key exchange, cipher
diff --git a/src/gnutls.c b/src/gnutls.c
index 46ef21137fb..aa800be2576 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -194,7 +194,7 @@ DEF_GNUTLS_FN (gnutls_kx_algorithm_t, gnutls_kx_get, (gnutls_session_t));
194DEF_GNUTLS_FN (const char*, gnutls_kx_get_name, (gnutls_kx_algorithm_t)); 194DEF_GNUTLS_FN (const char*, gnutls_kx_get_name, (gnutls_kx_algorithm_t));
195DEF_GNUTLS_FN (gnutls_protocol_t, gnutls_protocol_get_version, 195DEF_GNUTLS_FN (gnutls_protocol_t, gnutls_protocol_get_version,
196 (gnutls_session_t)); 196 (gnutls_session_t));
197DEF_GNUTLS_FN (const char*, gnutls_protocol_get_version, (gnutls_protocol_t)); 197DEF_GNUTLS_FN (const char*, gnutls_protocol_get_name, (gnutls_protocol_t));
198DEF_GNUTLS_FN (gnutls_cipher_algorithm_t, gnutls_cipher_get, 198DEF_GNUTLS_FN (gnutls_cipher_algorithm_t, gnutls_cipher_get,
199 (gnutls_session_t)); 199 (gnutls_session_t));
200DEF_GNUTLS_FN (const char*, gnutls_cipher_get_name, 200DEF_GNUTLS_FN (const char*, gnutls_cipher_get_name,