diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-02-24 09:53:19 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-02-24 09:53:19 +0000 |
| commit | a69387c6d80c9ae61463733fa99be7e331e185cf (patch) | |
| tree | 45b9055c7b66e717dd90e09d7bd59eadcc30a621 /textproc/xerces-c27/files/patch-aa | |
| parent | dc228774ef40c97533e861af91f6cdd177ed7efd (diff) | |
Notes
Diffstat (limited to 'textproc/xerces-c27/files/patch-aa')
| -rw-r--r-- | textproc/xerces-c27/files/patch-aa | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/textproc/xerces-c27/files/patch-aa b/textproc/xerces-c27/files/patch-aa index 7295016afa9f..3bc4dea4baac 100644 --- a/textproc/xerces-c27/files/patch-aa +++ b/textproc/xerces-c27/files/patch-aa @@ -1,26 +1,35 @@ -diff -x CVS -urN src/xercesc/util/Transcoders/ICU/ICUTransService.cpp src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp ---- src/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sat May 17 16:32:17 2003 -+++ src.cvs/xercesc/util/Transcoders/ICU/ICUTransService.cpp Sun Jun 15 10:02:16 2003 -@@ -55,7 +55,7 @@ - */ - - /* -- * $Id: ICUTransService.cpp,v 1.9 2003/05/17 16:32:17 knoaman Exp $ -+ * $Id: ICUTransService.cpp,v 1.10 2003/05/30 09:19:24 gareth Exp $ - */ - - -@@ -127,11 +127,11 @@ - - - static XMLCh* convertToXMLCh( const UChar* const toConvert, -- , MemoryManager* const manager = 0) -+ MemoryManager* const manager = 0) - { - const unsigned int srcLen = u_strlen(toConvert); - XMLCh* retBuf = (manager) -- ? (XMLCh*) manager->allocate((srcLen+1) sizeof(XMLCh)) -+ ? (XMLCh*) manager->allocate((srcLen+1) * sizeof(XMLCh)) - : new XMLCh[srcLen + 1]; - - XMLCh* outPtr = retBuf; +--- samples/runConfigure.orig Mon May 12 09:44:18 2003 ++++ samples/runConfigure Tue Feb 17 20:26:46 2004 +@@ -262,8 +262,13 @@ else + ;; + esac + elif test $platform = "freebsd"; then +- threadingLibs="-pthread -lc_r" +- threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS" ++ if test -n "${PTHREAD_LIBS}" ; then ++ threadingLibs="${PTHREAD_LIBS}" ++ threadingDefines="${PTHREAD_CFLAGS} -DXML_USE_PTHREADS" ++ else ++ threadingLibs="-lpthread" ++ threadingDefines="-DXML_USE_PTHREADS" ++ fi + elif test $platform = "netbsd"; then + threadingLibs="-pthread" + threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS" +--- src/xercesc/runConfigure.orig Tue Feb 17 20:05:09 2004 ++++ src/xercesc/runConfigure Tue Feb 17 20:27:13 2004 +@@ -303,8 +303,13 @@ else + ;; + esac + elif test $platform = "freebsd"; then +- threadingLibs="-pthread -lc_r" ++ if test -n "${PTHREAD_LIBS}" ; then ++ threadingLibs="${PTHREAD_LIBS}" ++ threadingDefines="${PTHREAD_CFLAGS} -DXML_USE_PTHREADS" ++ else ++ threadingLibs="-lpthread" + threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS" ++ fi + elif test $platform = "netbsd"; then + threadingLibs="-pthread -lpthread" + threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS" |