Rename wxWebHistoryItem to wxWebViewHistoryItem.

[wxWidgets.git] / src / stc / scintilla / include / SString.h

diff --git a/src/stc/scintilla/include/SString.h b/src/stc/scintilla/include/SString.h
index 38a206ccf2240224ce1dbdd3236c727ab54babc9..b770afebeedfaa6e896f3df0b5464c475f562b51 100644 (file)
--- a/src/stc/scintilla/include/SString.h
+++ b/src/stc/scintilla/include/SString.h
@@ -8,11 +8,16 @@
 #ifndef SSTRING_H
 #define SSTRING_H
 
 #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);
 
 // 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.
 // 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);
 }
 
        return SContainer::StringAllocate(s, len);
 }
 

+#ifdef SCI_NAMESPACE
+}
+#endif
+

 #endif
 #endif