diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-08-23 13:12:45 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-08-23 13:12:45 +0000 |
| commit | 384325efe41e09425a64bfd1aa150c836cef55fc (patch) | |
| tree | 820c40c83cf0a13294b2d97b49fe1349c38524f1 /textproc/xerces-c2/files/patch-ab | |
| parent | f74af8c62f218a0d352d622da9f57fa8fe05c558 (diff) | |
| download | ports-384325efe41e09425a64bfd1aa150c836cef55fc.tar.gz ports-384325efe41e09425a64bfd1aa150c836cef55fc.zip | |
Notes
Diffstat (limited to 'textproc/xerces-c2/files/patch-ab')
| -rw-r--r-- | textproc/xerces-c2/files/patch-ab | 54 |
1 files changed, 32 insertions, 22 deletions
diff --git a/textproc/xerces-c2/files/patch-ab b/textproc/xerces-c2/files/patch-ab index 8b613207d833..6358303a748d 100644 --- a/textproc/xerces-c2/files/patch-ab +++ b/textproc/xerces-c2/files/patch-ab @@ -1,28 +1,38 @@ ---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2002/11/04 15:14:34 1.4 -+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp 2003/03/07 15:08:57 1.5 +--- src/xercesc/dom/impl/DOMDeepNodeListPool.c Tue Jun 17 22:09:06 2003 ++++ src.cvs/xercesc/dom/impl/DOMDeepNodeListPool.c Tue Jun 17 22:09:39 2003 +@@ -90,7 +90,11 @@ + initialize(modulus); + + // create default hasher ++#if defined (XML_GCC_VERSION) && (XML_GCC_VERSION < 29600) ++ fHash = new HashPtr(); ++#else + fHash = new (fMemoryManager) HashPtr(); ++#endif + + // + // Allocate the initial id pointers array. We don't have to zero them +--- src/xercesc/util/RefHash3KeysIdPool.c Tue Jun 17 22:12:13 2003 ++++ src.cvs/xercesc/util/RefHash3KeysIdPool.c Sun Jun 15 09:57:39 2003 @@ -56,6 +56,9 @@ - /* - * $Log: IconvFBSDTransService.hpp,v $ -+ * Revision 1.5 2003/03/07 15:08:57 tng -+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb. + /** + * $Log: RefHash3KeysIdPool.c,v $ ++ * Revision 1.6 2003/06/02 15:18:08 neilg ++ * fix for bug #20092; thanks to Berin Lautenbach + * - * Revision 1.4 2002/11/04 15:14:34 tng - * C++ Namespace Support. - * -@@ -85,11 +88,13 @@ + * Revision 1.5 2003/05/21 21:08:04 knoaman + * gcc 2.95.x is generating an internal error for some template definitions, so + * we use the default memory manger in such cases. +@@ -118,7 +121,11 @@ + initialize(modulus); - #include <xercesc/util/TransService.hpp> - -+#ifdef XML_USE_LIBICONV -+# include <iconv.h> + // create default hasher ++#if defined (XML_GCC_VERSION) && (XML_GCC_VERSION < 29600) ++ fHash = new HashXMLCh(); ++#else + fHash = new (fMemoryManager) HashXMLCh(); +#endif -+ - XERCES_CPP_NAMESPACE_BEGIN - - #ifdef XML_USE_LIBICONV -- --# include <iconv.h> - // --------------------------------------------------------------------------- - // Libiconv wrapper (low-level conversion utilities collection) + // + // Allocate the initial id pointers array. We don't have to zero them |