Fix the MS-Windows build due to added GnuTLS functions

* src/gnutls.c [WINDOWSNT]: Add DEF_DLL_FN for new functions.
(init_gnutls_functions) [WINDOWSNT]: Add LOAD_DLL_FN for new
functions.  Add #define redirections for new functions.
(gnutls_symmetric_aead): Fix format specs to be more portable when
printing ptrdiff_t arguments.
* src/fns.c (gnutls_rnd) [WINDOWSNT]: Redirect to w32_gnutls_rnd
wrapper.
* src/gnutls.h [WINDOWSNT]: Add prototype for w32_gnutls_rnd.

* test/lisp/net/gnutls-tests.el (gnutls-tests-tested-macs)
(gnutls-tests-tested-digests, gnutls-tests-tested-ciphers): Call
gnutls-available-p, otherwise GnuTLS functions might not be loaded
from the DLL on MS-Windows.

1 files changed, 13 insertions, 10 deletions

diff --git a/test/lisp/net/gnutls-tests.el b/test/lisp/net/gnutls-tests.el
index 6f1ca744e54..9dbb6c05b9e 100644
--- a/test/lisp/net/gnutls-tests.el
+++ b/test/lisp/net/gnutls-tests.el
@@ -45,20 +45,23 @@
           (secure-hash-algorithms)))
 
 (defvar gnutls-tests-tested-macs
-  (remove-duplicates
-   (append (mapcar 'cdr gnutls-tests-internal-macs-upcased)
-           (mapcar 'car (gnutls-macs)))))
+  (when (gnutls-available-p)
+    (remove-duplicates
+     (append (mapcar 'cdr gnutls-tests-internal-macs-upcased)
+             (mapcar 'car (gnutls-macs))))))
 
 (defvar gnutls-tests-tested-digests
-  (remove-duplicates
-   (append (mapcar 'cdr gnutls-tests-internal-macs-upcased)
-           (mapcar 'car (gnutls-digests)))))
+  (when (gnutls-available-p)
+    (remove-duplicates
+     (append (mapcar 'cdr gnutls-tests-internal-macs-upcased)
+             (mapcar 'car (gnutls-digests))))))
 
 (defvar gnutls-tests-tested-ciphers
-  (remove-duplicates
-   ; these cause FPEs or SEGVs
-   (remove-if (lambda (e) (memq e '(ARCFOUR-128)))
-              (mapcar 'car (gnutls-ciphers)))))
+  (when (gnutls-available-p)
+    (remove-duplicates
+    ; these cause FPEs or SEGVs
+     (remove-if (lambda (e) (memq e '(ARCFOUR-128)))
+                (mapcar 'car (gnutls-ciphers))))))
 
 (defvar gnutls-tests-mondo-strings
   (list