diff options
| author | nyamatongwe <devnull@localhost> | 2010-04-07 23:07:40 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2010-04-07 23:07:40 +0000 |
| commit | e1bd04b8595cbfa379f26b1ade6985ccc77f8f19 (patch) | |
| tree | 918fe324ab870fb98082aabe964ef89f6045de33 | |
| parent | 86ad2634f417e669a8878b29cb885be66d10eba8 (diff) | |
| download | scintilla-mirror-e1bd04b8595cbfa379f26b1ade6985ccc77f8f19.tar.gz | |
Made Scintilla.h compatible with the C language when stdbool.h not included.
| -rw-r--r-- | include/Scintilla.h | 8 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h index 7730893d6..b91c78c2a 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -11,18 +11,14 @@ #ifndef SCINTILLA_H #define SCINTILLA_H -#if LCCWIN -typedef BOOL bool; -#endif - #ifdef __cplusplus extern "C" { #endif #if defined(_WIN32) /* Return false on failure: */ -bool Scintilla_RegisterClasses(void *hInstance); -bool Scintilla_ReleaseResources(); +int Scintilla_RegisterClasses(void *hInstance); +int Scintilla_ReleaseResources(); #endif int Scintilla_LinkLexers(); diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index f5eafc79f..6249f21b8 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -2682,7 +2682,7 @@ sptr_t PASCAL ScintillaWin::SWndProc( // This function is externally visible so it can be called from container when building statically. // Must be called once only. -bool Scintilla_RegisterClasses(void *hInstance) { +int Scintilla_RegisterClasses(void *hInstance) { Platform_Initialise(hInstance); bool result = ScintillaWin::Register(reinterpret_cast<HINSTANCE>(hInstance)); #ifdef SCI_LEXER @@ -2692,7 +2692,7 @@ bool Scintilla_RegisterClasses(void *hInstance) { } // This function is externally visible so it can be called from container when building statically. -bool Scintilla_ReleaseResources() { +int Scintilla_ReleaseResources() { bool result = ScintillaWin::Unregister(); Platform_Finalise(); return result; |