diff options
author | Aron Xu <aron@debian.org> | 2015-09-21 22:55:55 +0800 |
---|---|---|
committer | Aron Xu <aron@debian.org> | 2015-09-21 22:55:55 +0800 |
commit | e85cf827a804d9abf4cbf48af6394c49331de322 (patch) | |
tree | aab761b5168447ea51ad1a64c9e1594e48f84b12 /win32 | |
parent | 4b692ee8530176868e4832e30bdc4ba5bc145948 (diff) | |
download | libxml2-e85cf827a804d9abf4cbf48af6394c49331de322.tar.gz |
Revert "Merge tag 'upstream/2.9.1+dfsg1'"
This reverts commit 21ee18bdbc9a9d4500e12a1399d51c593b8b31d4, reversing
changes made to de338c1adfa336ddb5177ceb5c63bcd868a0ebc7.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile.msvc | 2 | ||||
-rw-r--r-- | win32/libxml2.def.src | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 2b3d544..d16c1a2 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -43,7 +43,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" # The compiler and its options. CC = cl.exe -CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "NOLIBTOOL" /W1 $(CRUNTIME) +CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME) CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) !if "$(WITH_THREADS)" != "no" CFLAGS = $(CFLAGS) /D "_REENTRANT" diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src index 4b85fc1..1bdbed9 100644 --- a/win32/libxml2.def.src +++ b/win32/libxml2.def.src @@ -557,6 +557,7 @@ xmlBufContent xmlBufEnd xmlBufGetNodeContent xmlBufNodeDump +xmlBufShrink xmlBufUse xmlBufferAdd xmlBufferAddHead @@ -1601,12 +1602,22 @@ xmlSAXParseMemoryWithData xmlSAXUserParseFile xmlSAXUserParseMemory xmlSAXVersion +xmlSaveClose +xmlSaveDoc xmlSaveFile xmlSaveFileEnc xmlSaveFileTo +xmlSaveFlush xmlSaveFormatFile xmlSaveFormatFileEnc xmlSaveFormatFileTo +xmlSaveSetAttrEscape +xmlSaveSetEscape +xmlSaveToBuffer +xmlSaveToFd +xmlSaveToFilename +xmlSaveToIO +xmlSaveTree xmlSaveUri xmlScanName #ifdef LIBXML_SCHEMAS_ENABLED @@ -1771,6 +1782,12 @@ xmlSchemaValidateOneElement xmlSchemaValidatePredefinedType #endif #ifdef LIBXML_SCHEMAS_ENABLED +xmlSchemaValidateSetFilename +#endif +#ifdef LIBXML_SCHEMAS_ENABLED +xmlSchemaValidateSetLocator +#endif +#ifdef LIBXML_SCHEMAS_ENABLED xmlSchemaValidateStream #endif #ifdef LIBXML_SCHEMAS_ENABLED @@ -1986,6 +2003,7 @@ xmlTextWriterFlush xmlTextWriterFullEndElement xmlTextWriterSetIndent xmlTextWriterSetIndentString +xmlTextWriterSetQuoteChar xmlTextWriterStartAttribute xmlTextWriterStartAttributeNS xmlTextWriterStartCDATA @@ -2913,6 +2931,9 @@ xmlXPathNextPrecedingSibling xmlXPathNextSelf #endif #ifdef LIBXML_XPATH_ENABLED +xmlXPathNodeEval +#endif +#ifdef LIBXML_XPATH_ENABLED xmlXPathNodeLeading #endif #ifdef LIBXML_XPATH_ENABLED @@ -3039,6 +3060,9 @@ xmlXPathRoot xmlXPathRoundFunction #endif #ifdef LIBXML_XPATH_ENABLED +xmlXPathSetContextNode +#endif +#ifdef LIBXML_XPATH_ENABLED xmlXPathStartsWithFunction #endif #ifdef LIBXML_XPATH_ENABLED |