lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

update from Igor for Windows Daniel

Browse Source 
* win32/dsp/* include/libxml/xmlwin32version.h.in: update
  from Igor for Windows
Daniel
This commit is contained in:
Daniel Veillard
2001-11-12 21:35:44 +00:00
parent 0135a3902d
commit 8e3943cbab
8 changed files with 1131 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Mon Nov 12 22:32:41 CET 2001 Daniel Veillard <daniel@veillard.com>
* win32/dsp/* include/libxml/xmlwin32version.h.in: update
from Igor for Windows
Mon Nov 12 10:19:41 CET 2001 Daniel Veillard <daniel@veillard.com>
* Makefile.am: Gary Pennington pointed out a missing prefix
Sat Nov 10 12:55:42 CET 2001 Daniel Veillard <daniel@veillard.com> Sat Nov 10 12:55:42 CET 2001 Daniel Veillard <daniel@veillard.com>
* configure.in include/libxml/xmlwin32version.h: preparing 2.4.10 * configure.in include/libxml/xmlwin32version.h: preparing 2.4.10

14
Makefile.am
View File

@ -435,21 +435,21 @@ Catatests : xmlcatalog
rm result.$$name ; \ rm result.$$name ; \
fi ; fi ; done) fi ; fi ; done)
@echo "Add and del operations on XML Catalogs" @echo "Add and del operations on XML Catalogs"
@(xmlcatalog --create --noout result/catalogs/mycatalog; \ @($(top_builddir)/xmlcatalog --create --noout result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --add public Pubid sysid result/catalogs/mycatalog; \ $(top_builddir)/xmlcatalog --noout --add public Pubid sysid result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --add public Pubid2 sysid2 result/catalogs/mycatalog; \ $(top_builddir)/xmlcatalog --noout --add public Pubid2 sysid2 result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --add public Pubid3 sysid3 result/catalogs/mycatalog; \ $(top_builddir)/xmlcatalog --noout --add public Pubid3 sysid3 result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
diff result/catalogs/mycatalog.full result/catalogs/mycatalog; \ diff result/catalogs/mycatalog.full result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --del sysid result/catalogs/mycatalog; \ $(top_builddir)/xmlcatalog --noout --del sysid result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --del sysid3 result/catalogs/mycatalog; \ $(top_builddir)/xmlcatalog --noout --del sysid3 result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
xmlcatalog --noout --del sysid2 result/catalogs/mycatalog; \ $(top_builddir)/xmlcatalog --noout --del sysid2 result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
diff result/catalogs/mycatalog.empty result/catalogs/mycatalog; \ diff result/catalogs/mycatalog.empty result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \

14
include/libxml/xmlwin32version.h
View File

@ -144,11 +144,9 @@ extern void xmlCheckVersion(int version);
* *
* Whether iconv support is available * Whether iconv support is available
*/ */
#if !defined(WIN32) || defined(__CYGWIN__)
#if 0 #if 0
#define LIBXML_ICONV_ENABLED #define LIBXML_ICONV_ENABLED
#endif #endif
#endif
/** /**
* LIBXML_DEBUG_ENABLED: * LIBXML_DEBUG_ENABLED:
@ -207,6 +205,18 @@ extern void xmlCheckVersion(int version);
#define ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED
#endif #endif
/**
* #pragma comment(lib, "iconv.lib")
*
* pragma understood my MS compiler which enables a conditional link with
* iconv.
*/
#ifdef _MSC_VER
#if defined LIBXML_ICONV_ENABLED && !defined LIBXML2_COMPILING_MSCCDEF
#pragma comment(lib, "iconv.lib")
#endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

14
include/libxml/xmlwin32version.h.in
View File

@ -144,11 +144,9 @@ extern void xmlCheckVersion(int version);
* *
* Whether iconv support is available * Whether iconv support is available
*/ */
#if !defined(WIN32) || defined(__CYGWIN__)
#if 0 #if 0
#define LIBXML_ICONV_ENABLED #define LIBXML_ICONV_ENABLED
#endif #endif
#endif
/** /**
* LIBXML_DEBUG_ENABLED: * LIBXML_DEBUG_ENABLED:
@ -207,6 +205,18 @@ extern void xmlCheckVersion(int version);
#define ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED
#endif #endif
/**
* #pragma comment(lib, "iconv.lib")
*
* pragma understood my MS compiler which enables a conditional link with
* iconv.
*/
#ifdef _MSC_VER
#if defined LIBXML_ICONV_ENABLED && !defined LIBXML2_COMPILING_MSCCDEF
#pragma comment(lib, "iconv.lib")
#endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

11
win32/dsp/libxml2.def.src
View File

@ -169,8 +169,12 @@ EXPORTS
htmlSaveFile htmlSaveFile
htmlNodeDump htmlNodeDump
htmlNodeDumpFile htmlNodeDumpFile
htmlNodeDumpFileFormat
htmlSaveFileEnc htmlSaveFileEnc
htmlSaveFileFormat htmlSaveFileFormat
htmlNodeDumpFormatOutput
htmlDocContentDumpOutput
htmlDocContentDumpFormatOutput
#endif /* LIBXML_HTML_ENABLED */ #endif /* LIBXML_HTML_ENABLED */
/* /*
@ -646,6 +650,7 @@ EXPORTS
// xmlStringText // xmlStringText
// xmlStringTextNoenc // xmlStringTextNoenc
// xmlStringComment // xmlStringComment
xmlSaveFormatFileEnc
xmlSaveFormatFile xmlSaveFormatFile
xmlUnsetProp xmlUnsetProp
// baseDTD DATA // baseDTD DATA
@ -762,6 +767,8 @@ EXPORTS
/* /*
* xmlIO.h * xmlIO.h
*/ */
xmlCleanupInputCallbacks
xmlCleanupOutputCallbacks
xmlRegisterDefaultInputCallbacks xmlRegisterDefaultInputCallbacks
xmlAllocParserInputBuffer xmlAllocParserInputBuffer
xmlParserInputBufferCreateFilename xmlParserInputBufferCreateFilename
@ -790,7 +797,10 @@ EXPORTS
xmlNodeDumpOutput xmlNodeDumpOutput
#ifdef LIBXML_HTML_ENABLED #ifdef LIBXML_HTML_ENABLED
htmlDocContentDumpOutput htmlDocContentDumpOutput
xmlIOHTTPOpenW
xmlRegisterHTTPPostCallbacks
#endif /* LIBXML_HTML_ENABLED */ #endif /* LIBXML_HTML_ENABLED */
xmlNoNetExternalEntityLoader
/* /*
* xmlmemory.h * xmlmemory.h
@ -944,6 +954,7 @@ EXPORTS
xmlXPathNewNodeSet xmlXPathNewNodeSet
xmlXPathNewNodeSetList xmlXPathNewNodeSetList
xmlXPathWrapNodeSet xmlXPathWrapNodeSet
xmlXPathWrapExternal
xmlXPathFreeNodeSetList xmlXPathFreeNodeSetList
xmlXPathNewFloat xmlXPathNewFloat
xmlXPathNewBoolean xmlXPathNewBoolean

28
win32/dsp/libxml2.dsw
View File

@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
############################################################################### ###############################################################################
Project: "libxml2_a"=.\libxml2_a.dsp - Package Owner=<4> Project: "libxml2_a"=".\libxml2_a.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
@ -15,7 +15,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "libxml2_so"=.\libxml2_so.dsp - Package Owner=<4> Project: "libxml2_so"=".\libxml2_so.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
@ -27,7 +27,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "testCatalog"=.\testCatalog.dsp - Package Owner=<4> Project: "testDocbook"=".\testDocbook.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
@ -39,7 +39,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "testDocbook"=.\testDocbook.dsp - Package Owner=<4> Project: "testHTML"=".\testHTML.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
@ -51,7 +51,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "testHTML"=.\testHTML.dsp - Package Owner=<4> Project: "testSAX"=".\testSAX.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
@ -63,7 +63,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "testSAX"=.\testSAX.dsp - Package Owner=<4> Project: "testURI"=".\testURI.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
@ -75,7 +75,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "testURI"=.\testURI.dsp - Package Owner=<4> Project: "testXPath"=".\testXPath.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
@ -87,19 +87,7 @@ Package=<4>
############################################################################### ###############################################################################
Project: "testXPath"=.\testXPath.dsp - Package Owner=<4> Project: "xmllint"=".\xmllint.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "xmllint"=.\xmllint.dsp - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{

12
win32/dsp/libxml2_a.dsp
View File

@ -113,6 +113,10 @@ SOURCE=..\..\error.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\globals.c
# End Source File
# Begin Source File
SOURCE=..\..\hash.c SOURCE=..\..\hash.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -149,6 +153,10 @@ SOURCE=..\..\SAX.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\threads.c
# End Source File
# Begin Source File
SOURCE=..\..\tree.c SOURCE=..\..\tree.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -169,6 +177,10 @@ SOURCE=..\..\xlink.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\xmlcatalog.c
# End Source File
# Begin Source File
SOURCE=..\..\xmlIO.c SOURCE=..\..\xmlIO.c
# End Source File # End Source File
# Begin Source File # Begin Source File

12
win32/dsp/libxml2_so.dsp
View File

@ -118,6 +118,10 @@ SOURCE=..\..\error.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\globals.c
# End Source File
# Begin Source File
SOURCE=..\..\hash.c SOURCE=..\..\hash.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -188,6 +192,10 @@ SOURCE=..\..\SAX.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\threads.c
# End Source File
# Begin Source File
SOURCE=..\..\tree.c SOURCE=..\..\tree.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -208,6 +216,10 @@ SOURCE=..\..\xlink.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\xmlcatalog.c
# End Source File
# Begin Source File
SOURCE=..\..\xmlIO.c SOURCE=..\..\xmlIO.c
# End Source File # End Source File
# Begin Source File # Begin Source File