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/XPM.cxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/XPM.cxx')

diff --git a/src/XPM.cxx b/src/XPM.cxx
index 36e7994f4..7fc05bb9b 100644
--- a/src/XPM.cxx
+++ b/src/XPM.cxx
@@ -12,6 +12,10 @@
 
 #include "XPM.h"
 
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
 static const char *NextField(const char *s) {
 	// In case there are leading spaces in the string
 	while (*s && *s == ' ') {
-- 
cgit v1.2.3