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/ContractionState.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/ContractionState.h')

diff --git a/src/ContractionState.h b/src/ContractionState.h
index e15ee3bbe..dbee69db7 100644
--- a/src/ContractionState.h
+++ b/src/ContractionState.h
@@ -8,6 +8,10 @@
 #ifndef CONTRACTIONSTATE_H
 #define CONTRACTIONSTATE_H
 
+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+
 /**
  */
 class OneLine {
@@ -62,4 +66,8 @@ public:
 	void ShowAll();
 };
 
+#ifdef SCI_NAMESPACE
+}
+#endif
+
 #endif
-- 
cgit v1.2.3