diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2015-08-25 21:55:55 +0200 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2015-08-25 21:55:55 +0200 |
| commit | 21ee18bdbc9a9d4500e12a1399d51c593b8b31d4 (patch) | |
| tree | 35c498d3ec731bcf7b90ce66bce68ecd54659250 /include/libxml/globals.h | |
| parent | de338c1adfa336ddb5177ceb5c63bcd868a0ebc7 (diff) | |
| parent | 7300193becde71a344c8ac0973dc290fa24d800d (diff) | |
| download | libxml2-21ee18bdbc9a9d4500e12a1399d51c593b8b31d4.tar.gz | |
Merge tag 'upstream/2.9.1+dfsg1'
Upstream version 2.9.1+dfsg1
Diffstat (limited to 'include/libxml/globals.h')
| -rw-r--r-- | include/libxml/globals.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/include/libxml/globals.h b/include/libxml/globals.h index a9305aa..9d688e0 100644 --- a/include/libxml/globals.h +++ b/include/libxml/globals.h @@ -39,9 +39,7 @@ XMLPUBFUN void XMLCALL xmlCleanupGlobals(void); * Returns the new xmlParserInputBufferPtr in case of success or NULL if no * method was found. */ -typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI, - xmlCharEncoding enc); - +typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI, xmlCharEncoding enc); /** * xmlOutputBufferCreateFilenameFunc: @@ -54,9 +52,7 @@ typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const * Returns the new xmlOutputBufferPtr in case of success or NULL if no * method was found. */ -typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI, - xmlCharEncodingHandlerPtr encoder, - int compression); +typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI, xmlCharEncodingHandlerPtr encoder, int compression); XMLPUBFUN xmlParserInputBufferCreateFilenameFunc XMLCALL xmlParserInputBufferCreateFilenameDefault (xmlParserInputBufferCreateFilenameFunc func); @@ -189,8 +185,7 @@ XMLPUBFUN xmlDeregisterNodeFunc XMLCALL xmlThrDefDeregisterNodeDefault(xmlDeregi XMLPUBFUN xmlOutputBufferCreateFilenameFunc XMLCALL xmlThrDefOutputBufferCreateFilenameDefault(xmlOutputBufferCreateFilenameFunc func); XMLPUBFUN xmlParserInputBufferCreateFilenameFunc XMLCALL - xmlThrDefParserInputBufferCreateFilenameDefault( - xmlParserInputBufferCreateFilenameFunc func); + xmlThrDefParserInputBufferCreateFilenameDefault(xmlParserInputBufferCreateFilenameFunc func); /** DOC_DISABLE */ /* @@ -302,8 +297,7 @@ XMLPUBFUN xmlBufferAllocationScheme * XMLCALL __xmlBufferAllocScheme(void); #else XMLPUBVAR xmlBufferAllocationScheme xmlBufferAllocScheme; #endif -XMLPUBFUN xmlBufferAllocationScheme XMLCALL - xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v); +XMLPUBFUN xmlBufferAllocationScheme XMLCALL xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v); XMLPUBFUN int * XMLCALL __xmlDefaultBufferSize(void); #ifdef LIBXML_THREAD_ENABLED @@ -485,8 +479,7 @@ XMLPUBFUN xmlDeregisterNodeFunc * XMLCALL __xmlDeregisterNodeDefaultValue(void); XMLPUBVAR xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue; #endif -XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL \ - __xmlParserInputBufferCreateFilenameValue(void); +XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL __xmlParserInputBufferCreateFilenameValue(void); #ifdef LIBXML_THREAD_ENABLED #define xmlParserInputBufferCreateFilenameValue \ (*(__xmlParserInputBufferCreateFilenameValue())) |