From bff5c376377f4c19a62e6a44eccda7dbe9deebaf Mon Sep 17 00:00:00 2001
From: scaraveo <devnull@localhost>
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/RESearch.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/RESearch.h')

diff --git a/src/RESearch.h b/src/RESearch.h
index befd36790..0944fc398 100644
--- a/src/RESearch.h
+++ b/src/RESearch.h
@@ -9,6 +9,10 @@
 #ifndef RESEARCH_H
 #define RESEARCH_H
 
+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+
 /*
  * The following defines are not meant to be changeable.
  * They are for readability only.
@@ -63,5 +67,9 @@ private:
 	}
 };
 
+#ifdef SCI_NAMESPACE
+}
+#endif
+
 #endif
 
-- 
cgit v1.2.3