From 9eb90ce37cb4beb01684e41ffb1eea740f3032ec Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 21 Apr 2015 14:41:38 +1000
Subject: =?UTF-8?q?Fix=20link=20error=20when=20SCI=5FNAMESPACE=20used.=20F?=
 =?UTF-8?q?rom=20Stefan=20K=C3=BCng.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/ScintillaHistory.html | 12 ++++++++++++
 win32/HanjaDic.cxx        |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index c6080f8c9..34647b49c 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -469,6 +469,7 @@
 	<td>Mika Attila</td>
 	<td>JoMazM</td>
 	<td>Markus Moser</td>
+	<td>Stefan Küng</td>
     </tr>
     </table>
     <p>
@@ -483,6 +484,17 @@
     <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a>
     </h3>
+    <ul>
+	<li>
+	Released 17 April 2015.
+	</li>
+	<li>
+	Fix link error on Windows when SCI_NAMESPACE used.
+	</li>
+    <ul>
+    <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a>
+    </h3>
     <ul>
 	<li>
 	Released 17 April 2015.
diff --git a/win32/HanjaDic.cxx b/win32/HanjaDic.cxx
index 3a86ad313..dbb755fb1 100644
--- a/win32/HanjaDic.cxx
+++ b/win32/HanjaDic.cxx
@@ -12,7 +12,7 @@
 #include "HanjaDic.h"
 
 #ifdef SCI_NAMESPACE
-using namespace Scintilla;
+namespace Scintilla {
 #endif
 
 namespace HanjaDict {
@@ -124,3 +124,6 @@ int GetHangulOfHanja(wchar_t *inout) {
 }
 
 }
+#ifdef SCI_NAMESPACE
+}
+#endif
-- 
cgit v1.2.3