diff options
| author | Chris Zheng | 2015-04-11 18:06:52 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-04-11 18:06:52 +0300 |
| commit | dc79845aac339db1cdcbbfc48d8f1569ed9a5aa2 (patch) | |
| tree | 142c234eb4510a8658080e1cda418024e17f68b0 /src | |
| parent | 279558f472246dd19864f4175cb1d6061bc1ed92 (diff) | |
| download | emacs-dc79845aac339db1cdcbbfc48d8f1569ed9a5aa2.tar.gz emacs-dc79845aac339db1cdcbbfc48d8f1569ed9a5aa2.zip | |
Support GnuTLS v3.4 and later on MS-Windows
* src/gnutls.c (syms_of_gnutls) <libgnutls-version>: New DEFSYM.
* lisp/term/w32-win.el (dynamic-library-alist): Determine which
GnuTLS DLL to load according to value of libgnutls-version.
Fixes: bug#20294
Copyright-paperwork-exempt: yes
Diffstat (limited to 'src')
| -rw-r--r-- | src/gnutls.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gnutls.c b/src/gnutls.c index 35f0eb48bc1..ddd36a91e9f 100644 --- a/src/gnutls.c +++ b/src/gnutls.c | |||
| @@ -1645,6 +1645,16 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, | |||
| 1645 | void | 1645 | void |
| 1646 | syms_of_gnutls (void) | 1646 | syms_of_gnutls (void) |
| 1647 | { | 1647 | { |
| 1648 | DEFSYM (Qlibgnutls_version, "libgnutls-version"); | ||
| 1649 | Fset (Qlibgnutls_version, | ||
| 1650 | #ifdef HAVE_GNUTLS | ||
| 1651 | make_number (GNUTLS_VERSION_MAJOR * 10000 | ||
| 1652 | + GNUTLS_VERSION_MINOR * 100 | ||
| 1653 | + GNUTLS_VERSION_PATCH) | ||
| 1654 | #else | ||
| 1655 | make_number (-1) | ||
| 1656 | #endif | ||
| 1657 | ); | ||
| 1648 | #ifdef HAVE_GNUTLS | 1658 | #ifdef HAVE_GNUTLS |
| 1649 | gnutls_global_initialized = 0; | 1659 | gnutls_global_initialized = 0; |
| 1650 | 1660 | ||