diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2014-12-27 13:15:55 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2014-12-27 13:15:55 -0300 |
| commit | 3a12f2ed99734eff668f83f630c7108000e0b399 (patch) | |
| tree | d00367f58fbe82773b1f45771df827d22f83d939 /src/gnutls.c | |
| parent | 6d14e0d361cfb3589874fe1b559e30b4fd3eb284 (diff) | |
| parent | 2616307f5c517124715b4d20bdd23c6c70366ac9 (diff) | |
Merge from origin/emacs-24
2616307 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.
c773edc * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in wrong debug buffer. (tramp-gw-open-connection): Set process coding system 'binary. (tramp-gw-open-network-stream): Handle HTTP error 403.
8032fc1 * .gitignore: Ignore /conftest*.
fb420e7 * lisp/subr.el (sit-for): Tweak docstring.
061db13 Fix vc-git-dir-status-files WRT up-to-date vs edited
bb57c94 Consider electric-pair-mode in tex-mode.
7b94572 * test/automated/flymake/warnpred/test.pl: Tweak earlier change.
59c218f ChangeLog fix
db2a768 * test/automated/flymake/warnpred/test.pl: Tweak format
d9005dd src/gnutls.c (gnutls_init): Fix deprecation warning from GCC.
Conflicts:
ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog
Diffstat (limited to 'src/gnutls.c')
| -rw-r--r-- | src/gnutls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gnutls.c b/src/gnutls.c index bf9f132354..14205ca0d3 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -134,7 +134,7 @@ DEF_GNUTLS_FN (void, gnutls_global_set_mem_functions, gnutls_is_secure_function, gnutls_realloc_function, gnutls_free_function)); DEF_GNUTLS_FN (int, gnutls_handshake, (gnutls_session_t)); -DEF_GNUTLS_FN (int, gnutls_init, (gnutls_session_t *, gnutls_connection_end_t)); +DEF_GNUTLS_FN (int, gnutls_init, (gnutls_session_t *, unsigned int)); DEF_GNUTLS_FN (int, gnutls_priority_set_direct, (gnutls_session_t, const char *, const char **)); DEF_GNUTLS_FN (size_t, gnutls_record_check_pending, (gnutls_session_t)); |