aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/XPM.cxx
diff options
context:
space:
mode:
authorscaraveo <unknown>2007-06-01 00:57:26 +0000
committerscaraveo <unknown>2007-06-01 00:57:26 +0000
commit710f716e96f6e9ee9eb410b343b78b3c4d95bc46 (patch)
tree55e5547869daa67b6a639c89825058baf75545c7 /src/XPM.cxx
parentcac98b923422b91839f7c285a9b78ea282cd6f0a (diff)
downloadscintilla-mirror-710f716e96f6e9ee9eb410b343b78b3c4d95bc46.tar.gz
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
Diffstat (limited to 'src/XPM.cxx')
-rw-r--r--src/XPM.cxx4
1 files changed, 4 insertions, 0 deletions
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 == ' ') {