aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/PropSet.h
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 /include/PropSet.h
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 'include/PropSet.h')
-rw-r--r--include/PropSet.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/PropSet.h b/include/PropSet.h
index e38de7dc4..e9d028c44 100644
--- a/include/PropSet.h
+++ b/include/PropSet.h
@@ -13,6 +13,10 @@ bool EqualCaseInsensitive(const char *a, const char *b);
bool isprefix(const char *target, const char *prefix);
+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+
struct Property {
unsigned int hash;
char *key;
@@ -104,6 +108,9 @@ inline bool IsAlphabetic(unsigned int ch) {
return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z'));
}
+#ifdef SCI_NAMESPACE
+}
+#endif
#ifdef _MSC_VER
// Visual C++ doesn't like the private copy idiom for disabling