diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Document.cxx | 8 | ||||
| -rw-r--r-- | src/Editor.cxx | 8 | ||||
| -rw-r--r-- | src/LexGen.py | 4 |
3 files changed, 2 insertions, 18 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index b70024f34..3865c6c3d 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -14,14 +14,6 @@ #include <string> #include <vector> -// With Borland C++ 5.5, including <string> includes Windows.h leading to defining -// FindText to FindTextA which makes calls here to Document::FindText fail. -#ifdef __BORLANDC__ -#ifdef FindText -#undef FindText -#endif -#endif - #include "Platform.h" #include "ILexer.h" diff --git a/src/Editor.cxx b/src/Editor.cxx index 0b78f8f0a..01415ec88 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -16,14 +16,6 @@ #include <algorithm> #include <memory> -// With Borland C++ 5.5, including <string> includes Windows.h leading to defining -// FindText to FindTextA which makes calls here to Document::FindText fail. -#ifdef __BORLANDC__ -#ifdef FindText -#undef FindText -#endif -#endif - #include "Platform.h" #include "ILexer.h" diff --git a/src/LexGen.py b/src/LexGen.py index 5084596c6..d4ff21555 100644 --- a/src/LexGen.py +++ b/src/LexGen.py @@ -295,8 +295,8 @@ def RegenerateAll(): Regenerate(root + "scintilla/win32/scintilla.mak", "#", NATIVE, lexFiles) Regenerate(root + "scintilla/win32/scintilla_vc6.mak", "#", NATIVE, lexFiles) if os.path.exists(root + "scite"): - Regenerate(root + "scite/win32/makefile", "#", NATIVE, lexFiles, propFiles) - Regenerate(root + "scite/win32/scite.mak", "#", NATIVE, lexFiles, propFiles) + Regenerate(root + "scite/win32/makefile", "#", NATIVE, propFiles) + Regenerate(root + "scite/win32/scite.mak", "#", NATIVE, propFiles) Regenerate(root + "scite/src/SciTEProps.cxx", "//", NATIVE, lexerProperties) Regenerate(root + "scite/doc/SciTEDoc.html", "<!--", NATIVE, propertiesHTML) Generate(root + "scite/boundscheck/vcproj.gen", |