tng 2003/03/07 07:08:58
Modified: c/src/xercesc/util/Transcoders/IconvFBSD
IconvFBSDTransService.cpp IconvFBSDTransService.hpp
Log:
[Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
Revision Changes Path
1.10 +7 -2
xml-xerces/c/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
Index: IconvFBSDTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IconvFBSDTransService.cpp 7 Mar 2003 14:42:45 -0000 1.9
+++ IconvFBSDTransService.cpp 7 Mar 2003 15:08:57 -0000 1.10
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2003/03/07 15:08:57 tng
+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
+ *
* Revision 1.9 2003/03/07 14:42:45 tng
* [Bug 17570] IconvFBSD build on alpha,sparc. Patch from Bjoern A. Zeeb.
*
@@ -213,6 +216,10 @@
#include <stdlib.h>
#include <stdio.h>
+#if !defined(APP_NO_THREADS)
+#include <xercesc/util/Mutexes.hpp>
+#endif
+
XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
@@ -320,8 +327,6 @@
#else /* XML_USE_LIBICONV */
#if !defined(APP_NO_THREADS)
-
-#include <xercesc/util/Mutexes.hpp>
// Iconv() access syncronization point
static XMLMutex *gIconvMutex = NULL;
# define ICONV_LOCK XMLMutexLock lockConverter(gIconvMutex);
1.5 +7 -2
xml-xerces/c/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
Index: IconvFBSDTransService.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IconvFBSDTransService.hpp 4 Nov 2002 15:14:34 -0000 1.4
+++ IconvFBSDTransService.hpp 7 Mar 2003 15:08:57 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/03/07 15:08:57 tng
+ * [Bug 17571] fix building IconvFBSD (namespaces) . Patch from Bjoern A. Zeeb.
+ *
* Revision 1.4 2002/11/04 15:14:34 tng
* C++ Namespace Support.
*
@@ -85,11 +88,13 @@
#include <xercesc/util/TransService.hpp>
+#ifdef XML_USE_LIBICONV
+# include <iconv.h>
+#endif
+
XERCES_CPP_NAMESPACE_BEGIN
#ifdef XML_USE_LIBICONV
-
-# include <iconv.h>
// ---------------------------------------------------------------------------
// Libiconv wrapper (low-level conversion utilities collection)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
