From 7ef5b23732e5c09804a32b58a9e2a3ece8a9c73c Mon Sep 17 00:00:00 2001
From: Tinny Ng <tng@apache.org>
Date: Fri, 7 Mar 2003 15:08:57 +0000
Subject: [PATCH] [Bug 17571] fix building IconvFBSD (namespaces) . Patch from
Bjoern A. Zeeb.
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@174828 13f79535-47bb-0310-9956-ffa450edef68
---
.../util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp | 9 +++++++--
.../util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
index 5b957dd32..e90389422 100644
--- a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
+++ b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
@@ -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 @@ static const IconvFBSDEncoding gIconvFBSDEncodings[] = {
#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 @@ static wint_t fbsd_towlower(wint_t ch)
#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);
diff --git a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
index 7751524e9..b09c38bdf 100644
--- a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
+++ b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
@@ -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,12 +88,14 @@
#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)
// ---------------------------------------------------------------------------
--
GitLab