diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-01-01 18:26:51 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-01-01 18:26:51 +0200 |
| commit | 651e947eb84b9201faa63ff6dc855a8c99ac8018 (patch) | |
| tree | 9a6066cf3d55728499d235e830736efb08859eb9 /lisp/term | |
| parent | 7da5b94434256b084e7755d53e6708f6ff4f7dc1 (diff) | |
| download | emacs-651e947eb84b9201faa63ff6dc855a8c99ac8018.tar.gz | |
Allow Emacs on w32 to build against and work with GnuTLS 3.x.
src/gnutls.c (init_gnutls_functions): Load gnutls_check_version.
Load gnutls_transport_set_lowat only if GnuTLS version is below
2.11.1.
(emacs_gnutls_handshake): Call gnutls_transport_set_lowat only for
GnuTLS versions below 2.11.1.
lisp/term/w32-win.el (dynamic-library-alist) <gnutls>: Load
libgnutls-28.dll, from GnuTLS version 3.x, in preference to
libgnutls-26.dll.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/w32-win.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index b7f2a69e77b..c7189d15241 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -210,7 +210,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll") '(glib "libglib-2.0-0.dll") '(gobject "libgobject-2.0-0.dll") - '(gnutls "libgnutls-26.dll"))) + '(gnutls "libgnutls-28.dll" "libgnutls-26.dll"))) ;;; multi-tty support (defvar w32-initialized nil |