From d3c03f65fe25e133b8ef8a5f67b675b434605305 Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 11 Sep 2017 09:05:35 +1000 Subject: Backport: The Scintilla namespace is always active for internal symbols and for the lexer and document interfaces. Backport of changeset 6388:d62863ae40a3. --- src/Document.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/Document.h') diff --git a/src/Document.h b/src/Document.h index 6cc134bf2..7b6921e21 100644 --- a/src/Document.h +++ b/src/Document.h @@ -8,9 +8,7 @@ #ifndef DOCUMENT_H #define DOCUMENT_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif enum EncodingFamily { efEightBit, efUnicode, efDBCS }; @@ -547,8 +545,6 @@ public: virtual void NotifyErrorOccurred(Document *doc, void *userData, int status) = 0; }; -#ifdef SCI_NAMESPACE } -#endif #endif -- cgit v1.2.3