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

1 files changed, 9 insertions, 0 deletions

diff --git a/include/SString.h b/include/SString.h
index 38a206ccf..b770afebe 100644
--- a/include/SString.h
+++ b/include/SString.h
@@ -8,11 +8,16 @@
 #ifndef SSTRING_H
 #define SSTRING_H
 
+
 // These functions are implemented because each platform calls them something different.
 int CompareCaseInsensitive(const char *a, const char *b);
 int CompareNCaseInsensitive(const char *a, const char *b, size_t len);
 bool EqualCaseInsensitive(const char *a, const char *b);
 
+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+
 // Define another string class.
 // While it would be 'better' to use std::string, that doubles the executable size.
 // An SString may contain embedded nul characters.
@@ -277,4 +282,8 @@ inline char *StringDup(
 	return SContainer::StringAllocate(s, len);
 }
 
+#ifdef SCI_NAMESPACE
+}
+#endif
+
 #endif