aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/KeyWords.h
diff options
context:
space:
mode:
authorscaraveo <devnull@localhost>2007-06-01 00:57:26 +0000
committerscaraveo <devnull@localhost>2007-06-01 00:57:26 +0000
commitbff5c376377f4c19a62e6a44eccda7dbe9deebaf (patch)
tree55e5547869daa67b6a639c89825058baf75545c7 /include/KeyWords.h
parent664fee964e1f91132ebf07a4b122e59c1e932ea6 (diff)
downloadscintilla-mirror-bff5c376377f4c19a62e6a44eccda7dbe9deebaf.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 'include/KeyWords.h')
-rw-r--r--include/KeyWords.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/KeyWords.h b/include/KeyWords.h
index 059ac0da0..6abae5945 100644
--- a/include/KeyWords.h
+++ b/include/KeyWords.h
@@ -5,6 +5,10 @@
// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed.
+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+
typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle,
WordList *keywordlists[], Accessor &styler);
@@ -51,6 +55,10 @@ public:
static const LexerModule *Find(const char *languageName);
};
+#ifdef SCI_NAMESPACE
+}
+#endif
+
/**
* Check if a character is a space.
* This is ASCII specific but is safe with chars >= 0x80.