aboutsummaryrefslogtreecommitdiffstats
path: root/src/gnutls.c
diff options
context:
space:
mode:
authorChong Yidong2012-09-23 17:16:57 +0800
committerChong Yidong2012-09-23 17:16:57 +0800
commitd07ff9db920196077333148f6db88525c8ba3151 (patch)
tree728ab8cebaa9efbfaa79b6076374435727d47db2 /src/gnutls.c
parent4d7e6e51dd4acecff466a28d958c50f34fc130b8 (diff)
downloademacs-d07ff9db920196077333148f6db88525c8ba3151.tar.gz
emacs-d07ff9db920196077333148f6db88525c8ba3151.zip
Remove LIBRARIES arg from w32_delayed_load and friends.
These always use Vdynamic_library_alist anyway. * src/image.c (Finit_image_library, lookup_image_type) (define_image_type): Remove now-unneeded second arg. (init_xpm_functions, init_png_functions, init_jpeg_functions) (init_tiff_functions, init_gif_functions, init_svg_functions): Arglist and w32_delayed_load calling convention changed. (gs_type): Remove init_gs_functions; there is no such function. * src/gnutls.c (init_gnutls_functions): Caller changed; remove arg. (Fgnutls_available_p): Caller changed. * src/xml.c (init_libxml2_functions, Flibxml_parse_html_region) (Flibxml_parse_xml_region): Likewise. * src/dispextern.h (struct image_type): Remove arg from init function. * src/w32.c (w32_delayed_load): Remove LIBRARIES argument; always use Vdynamic_library_alist. * lisp/image.el (image-type-available-p): Change caller to init-image-library.
Diffstat (limited to 'src/gnutls.c')
-rw-r--r--src/gnutls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index 1c4693aee32..cfe7d97aa59 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -142,12 +142,12 @@ DEF_GNUTLS_FN (int, gnutls_x509_crt_import,
142DEF_GNUTLS_FN (int, gnutls_x509_crt_init, (gnutls_x509_crt_t *)); 142DEF_GNUTLS_FN (int, gnutls_x509_crt_init, (gnutls_x509_crt_t *));
143 143
144static int 144static int
145init_gnutls_functions (Lisp_Object libraries) 145init_gnutls_functions (void)
146{ 146{
147 HMODULE library; 147 HMODULE library;
148 int max_log_level = 1; 148 int max_log_level = 1;
149 149
150 if (!(library = w32_delayed_load (libraries, Qgnutls_dll))) 150 if (!(library = w32_delayed_load (Qgnutls_dll)))
151 { 151 {
152 GNUTLS_LOG (1, max_log_level, "GnuTLS library not found"); 152 GNUTLS_LOG (1, max_log_level, "GnuTLS library not found");
153 return 0; 153 return 0;
@@ -656,7 +656,7 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
656 else 656 else
657 { 657 {
658 Lisp_Object status; 658 Lisp_Object status;
659 status = init_gnutls_functions (Vdynamic_library_alist) ? Qt : Qnil; 659 status = init_gnutls_functions () ? Qt : Qnil;
660 Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache); 660 Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache);
661 return status; 661 return status;
662 } 662 }