From 710f716e96f6e9ee9eb410b343b78b3c4d95bc46 Mon Sep 17 00:00:00 2001
From: scaraveo <unknown>
Date: Fri, 1 Jun 2007 00:57:26 +0000
Subject: integrate OS X support for scintilla.  a big patch with a little
 commit message :)

- now uses namespaces (optionally for non-os x) to avoid conflicts with OS X libraries
- several fixes in the OS X layer since the branch was commited in 2005
- used in Komodo since 2005, so pretty stable
---
 src/LexConf.cxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/LexConf.cxx')

diff --git a/src/LexConf.cxx b/src/LexConf.cxx
index c33cdb5ce..969275f92 100644
--- a/src/LexConf.cxx
+++ b/src/LexConf.cxx
@@ -23,6 +23,10 @@
 #include "Scintilla.h"
 #include "SciLexer.h"
 
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
 static void ColouriseConfDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler)
 {
 	int state = SCE_CONF_DEFAULT;
-- 
cgit v1.2.3