diff options
Diffstat (limited to 'src/xml.c')
| -rw-r--r-- | src/xml.c | 10 |
1 files changed, 5 insertions, 5 deletions
| @@ -73,7 +73,7 @@ libxml2_loaded_p (void) | |||
| 73 | #define fn_xmlCleanupParser xmlCleanupParser | 73 | #define fn_xmlCleanupParser xmlCleanupParser |
| 74 | #define fn_xmlCheckVersion xmlCheckVersion | 74 | #define fn_xmlCheckVersion xmlCheckVersion |
| 75 | 75 | ||
| 76 | static inline int | 76 | static int |
| 77 | libxml2_loaded_p (void) | 77 | libxml2_loaded_p (void) |
| 78 | { | 78 | { |
| 79 | return 1; | 79 | return 1; |
| @@ -82,7 +82,7 @@ libxml2_loaded_p (void) | |||
| 82 | #endif /* !WINDOWSNT */ | 82 | #endif /* !WINDOWSNT */ |
| 83 | 83 | ||
| 84 | static int | 84 | static int |
| 85 | init_libxml2_functions (Lisp_Object libraries) | 85 | init_libxml2_functions (void) |
| 86 | { | 86 | { |
| 87 | #ifdef WINDOWSNT | 87 | #ifdef WINDOWSNT |
| 88 | if (libxml2_loaded_p ()) | 88 | if (libxml2_loaded_p ()) |
| @@ -91,7 +91,7 @@ init_libxml2_functions (Lisp_Object libraries) | |||
| 91 | { | 91 | { |
| 92 | HMODULE library; | 92 | HMODULE library; |
| 93 | 93 | ||
| 94 | if (!(library = w32_delayed_load (libraries, Qlibxml2_dll))) | 94 | if (!(library = w32_delayed_load (Qlibxml2_dll))) |
| 95 | { | 95 | { |
| 96 | message ("%s", "libxml2 library not found"); | 96 | message ("%s", "libxml2 library not found"); |
| 97 | return 0; | 97 | return 0; |
| @@ -257,7 +257,7 @@ DEFUN ("libxml-parse-html-region", Flibxml_parse_html_region, | |||
| 257 | If BASE-URL is non-nil, it is used to expand relative URLs. */) | 257 | If BASE-URL is non-nil, it is used to expand relative URLs. */) |
| 258 | (Lisp_Object start, Lisp_Object end, Lisp_Object base_url) | 258 | (Lisp_Object start, Lisp_Object end, Lisp_Object base_url) |
| 259 | { | 259 | { |
| 260 | if (init_libxml2_functions (Vdynamic_library_alist)) | 260 | if (init_libxml2_functions ()) |
| 261 | return parse_region (start, end, base_url, 1); | 261 | return parse_region (start, end, base_url, 1); |
| 262 | return Qnil; | 262 | return Qnil; |
| 263 | } | 263 | } |
| @@ -269,7 +269,7 @@ DEFUN ("libxml-parse-xml-region", Flibxml_parse_xml_region, | |||
| 269 | If BASE-URL is non-nil, it is used to expand relative URLs. */) | 269 | If BASE-URL is non-nil, it is used to expand relative URLs. */) |
| 270 | (Lisp_Object start, Lisp_Object end, Lisp_Object base_url) | 270 | (Lisp_Object start, Lisp_Object end, Lisp_Object base_url) |
| 271 | { | 271 | { |
| 272 | if (init_libxml2_functions (Vdynamic_library_alist)) | 272 | if (init_libxml2_functions ()) |
| 273 | return parse_region (start, end, base_url, 0); | 273 | return parse_region (start, end, base_url, 0); |
| 274 | return Qnil; | 274 | return Qnil; |
| 275 | } | 275 | } |