diff options
author | Mike Hommey <glandium@debian.org> | 2006-04-29 21:57:40 +0200 |
---|---|---|
committer | Mike Hommey <glandium@debian.org> | 2006-04-29 21:57:40 +0200 |
commit | 07a67fa4bcc1b8bf2651ab41e5fc54a05059cf7e (patch) | |
tree | 7b377fd8e804a983cb2c57a43be1093ef179c5fd /win32 | |
parent | c5d565931c4823dc8f62fffcb65aecfec516f7b9 (diff) | |
download | libxml2-07a67fa4bcc1b8bf2651ab41e5fc54a05059cf7e.tar.gz |
Load /tmp/libxml2-2.6.24 intoupstream/2.6.24.dfsg
libxml2/branches/upstream/current.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile.bcb | 7 | ||||
-rw-r--r-- | win32/Makefile.mingw | 4 | ||||
-rw-r--r-- | win32/Makefile.msvc | 3 | ||||
-rw-r--r-- | win32/libxml2.def.src | 6 |
4 files changed, 16 insertions, 4 deletions
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb index 6603d2a..e706dc8 100644 --- a/win32/Makefile.bcb +++ b/win32/Makefile.bcb @@ -136,6 +136,7 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\ $(XML_INTDIR)\relaxng.obj\ $(XML_INTDIR)\SAX.obj\ $(XML_INTDIR)\SAX2.obj\ + $(XML_INTDIR)\schematron.obj\ $(XML_INTDIR)\threads.obj\ $(XML_INTDIR)\tree.obj\ $(XML_INTDIR)\uri.obj\ @@ -180,6 +181,7 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ $(XML_INTDIR_A)\relaxng.obj\ $(XML_INTDIR_A)\SAX.obj\ $(XML_INTDIR_A)\SAX2.obj\ + $(XML_INTDIR_A)\schematron.obj\ $(XML_INTDIR_A)\threads.obj\ $(XML_INTDIR_A)\tree.obj\ $(XML_INTDIR_A)\uri.obj\ @@ -215,8 +217,9 @@ UTILS = $(BINDIR)\xmllint.exe\ $(BINDIR)\testSchemas.exe\ $(BINDIR)\testURI.exe\ $(BINDIR)\testXPath.exe\ - $(BINDIR)\runtest.exe\
- $(BINDIR)\runsuite.exe + $(BINDIR)\runtest.exe\ + $(BINDIR)\runsuite.exe\ + $(BINDIR)\testapi.exe !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native" diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw index 4c3d018..f41ce6d 100644 --- a/win32/Makefile.mingw +++ b/win32/Makefile.mingw @@ -212,7 +212,9 @@ UTILS = $(BINDIR)/xmllint.exe\ $(BINDIR)/testURI.exe\ $(BINDIR)/testXPath.exe\ $(BINDIR)/runtest.exe\ - $(BINDIR)/runsuite.exe + $(BINDIR)/runsuite.exe\ + $(BINDIR)/testapi.exe + ifeq ($(WITH_THREADS),yes) UTILS += $(BINDIR)/testThreadsWin32.exe endif diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 0c0a41b..35f4a80 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -197,7 +197,8 @@ UTILS = $(BINDIR)\xmllint.exe\ $(BINDIR)\testURI.exe\ $(BINDIR)\testXPath.exe\ $(BINDIR)\runtest.exe\ - $(BINDIR)\runsuite.exe + $(BINDIR)\runsuite.exe\ + $(BINDIR)\testapi.exe !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native" UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src index 6100bda..367f248 100644 --- a/win32/libxml2.def.src +++ b/win32/libxml2.def.src @@ -712,6 +712,7 @@ xmlCtxtResetPush xmlCtxtUseOptions xmlCurrentChar xmlDOMWrapAdoptNode +xmlDOMWrapCloneNode xmlDOMWrapFreeCtxt xmlDOMWrapNewCtxt xmlDOMWrapReconcileNamespaces @@ -1500,6 +1501,9 @@ xmlRelaxNGParse xmlRelaxNGSetParserErrors #endif #ifdef LIBXML_SCHEMAS_ENABLED +xmlRelaxNGSetParserStructuredErrors +#endif +#ifdef LIBXML_SCHEMAS_ENABLED xmlRelaxNGSetValidErrors #endif #ifdef LIBXML_SCHEMAS_ENABLED @@ -1854,6 +1858,8 @@ xmlStrdup xmlStreamPop xmlStreamPush xmlStreamPushAttr +xmlStreamPushNode +xmlStreamWantsAnyNode xmlStringCurrentChar xmlStringDecodeEntities xmlStringGetNodeList |