aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/Scintilla.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2016-11-18 09:33:40 +1100
committerNeil <nyamatongwe@gmail.com>2016-11-18 09:33:40 +1100
commit2a469cc8054031ee127d0eeb711b5b90250443a0 (patch)
tree9a133b10f41100c185f5a45368ba037a3cf774ac /include/Scintilla.h
parentc4c91a5e9d5e966e4c81d541d2d7e95392c6c7ec (diff)
downloadscintilla-mirror-2a469cc8054031ee127d0eeb711b5b90250443a0.tar.gz
Remove the Scintilla namespace from Scintilla.h.
Diffstat (limited to 'include/Scintilla.h')
-rw-r--r--include/Scintilla.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h
index 57373c24d..056b2e276 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -36,7 +36,7 @@ int Scintilla_LinkLexers(void);
// Define uptr_t, an unsigned integer type large enough to hold a pointer.
typedef uintptr_t uptr_t;
-// Define sptr_t, a signed integer large enough to hold a pointer.
+// Define sptr_t, a signed integer large enough to hold a pointer.
typedef intptr_t sptr_t;
#include "Sci_Position.h"
@@ -1091,10 +1091,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
* CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
* So older code that treats Scintilla as a RichEdit will work. */
-#if defined(__cplusplus) && defined(SCI_NAMESPACE)
-namespace Scintilla {
-#endif
-
struct Sci_CharacterRange {
Sci_PositionCR cpMin;
Sci_PositionCR cpMax;
@@ -1186,10 +1182,6 @@ struct SCNotification {
/* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION, */
};
-#if defined(__cplusplus) && defined(SCI_NAMESPACE)
-}
-#endif
-
#ifdef INCLUDE_DEPRECATED_FEATURES
#define SCI_SETKEYSUNICODE 2521