Author: jberry
Date: Thu May 26 16:38:07 2005
New Revision: 178713
URL: http://svn.apache.org/viewcvs?rev=178713&view=rev
Log:
Tuneups to iconv support
Modified:
xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
Modified:
xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4?rev=178713&r1=178712&r2=178713&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
(original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4 Thu
May 26 16:38:07 2005
@@ -22,8 +22,8 @@
tc_list=
# Check for iconv support
- AC_CHECK_HEADERS([wchar.h], [], [no_iconv=true])
- AC_CHECK_FUNCS([towupper towlower mblen wcstombs mbstowcs], [],
[no_iconv=true])
+ AC_CHECK_HEADERS([wchar.h wctype.h], [], [no_iconv=true])
+ AC_CHECK_FUNCS([towupper towlower iswspace mblen wcstombs mbstowcs],
[], [no_iconv=true])
AC_MSG_CHECKING([for whether we can support the iconv Transcoder])
list_add=
no_iconv=false
Modified:
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp?rev=178713&r1=178712&r2=178713&view=diff
==============================================================================
---
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
(original)
+++
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
Thu May 26 16:38:07 2005
@@ -26,23 +26,11 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/framework/MemoryManager.hpp>
+
+// *** TODO: May need some autoconf checks for wctype.h, and possible
substitution thereof
#include <wchar.h>
+#include <wctype.h>
-#if defined (XML_GCC) || defined (XML_PTX) || defined (XML_IBMVAOS2) ||
defined(XML_LINUX) || defined (XML_UNIXWARE)
- #if defined(XML_BEOS)
- wint_t towlower(wint_t wc) {
- return ((wc>'A')&&(wc<'Z') ? wc+'a'-'A' : wc);
- }
- wint_t towupper(wint_t wc) {
- return ((wc>'a')&&(wc<'z') ? wc-'a'+'A' : wc);
- }
- wint_t iswspace(wint_t wc) {
- return (wc==(wint_t)' ');
- }
- #elif !defined(XML_OPENSERVER)
- #include <wctype.h>
- #endif
-#endif
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
