diff options
52 files changed, 163 insertions, 101 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index f140295c5..4d006b1ff 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -17,6 +17,7 @@ #include <Cocoa/Cocoa.h> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" #include "Scintilla.h" diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index d01c73da6..a13c2eac0 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -32,6 +32,7 @@ #import <Foundation/NSGeometry.h> +#import "Debugging.h" #import "Geometry.h" #import "Platform.h" diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index f826b3565..72516be5c 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -26,6 +26,7 @@ #import <QuartzCore/CAAnimation.h> #import <QuartzCore/CATransaction.h> +#import "Debugging.h" #import "Geometry.h" #import "Platform.h" #import "ScintillaView.h" diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index 2af97c278..ab5d0eee4 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -15,6 +15,7 @@ #include <string_view> #include <vector> +#import "Debugging.h" #import "Geometry.h" #import "Platform.h" #import "ScintillaView.h" diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 45564df78..b532826a7 100755 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -23,6 +23,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 5fd8bac89..beb113484 100755 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -36,6 +36,7 @@ #include <windows.h> #endif +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx index 207f657d9..1fa044a8e 100644 --- a/gtk/ScintillaGTKAccessible.cxx +++ b/gtk/ScintillaGTKAccessible.cxx @@ -87,6 +87,7 @@ #endif // ScintillaGTK.h and stuff it needs +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/gtk/deps.mak b/gtk/deps.mak index 3d7d28fbf..f446b6dd1 100644 --- a/gtk/deps.mak +++ b/gtk/deps.mak @@ -1,6 +1,7 @@ # Created by DepGen.py. To recreate, run DepGen.py. PlatGTK.o: \ PlatGTK.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -12,6 +13,7 @@ PlatGTK.o: \ Converter.h ScintillaGTK.o: \ ScintillaGTK.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -53,6 +55,7 @@ ScintillaGTK.o: \ Converter.h ScintillaGTKAccessible.o: \ ScintillaGTKAccessible.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -92,6 +95,7 @@ ScintillaGTKAccessible.o: \ ScintillaGTKAccessible.h AutoComplete.o: \ ../src/AutoComplete.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -101,6 +105,7 @@ AutoComplete.o: \ ../src/AutoComplete.h CallTip.o: \ ../src/CallTip.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -118,8 +123,7 @@ CaseFolder.o: \ ../src/CaseConvert.h CellBuffer.o: \ ../src/CellBuffer.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -139,8 +143,7 @@ CharClassify.o: \ ../src/CharClassify.h ContractionState.o: \ ../src/ContractionState.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -153,8 +156,7 @@ DBCS.o: \ ../src/DBCS.h Decoration.o: \ ../src/Decoration.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -164,8 +166,7 @@ Decoration.o: \ ../src/Decoration.h Document.o: \ ../src/Document.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/ILoader.h \ ../include/Sci_Position.h \ ../include/ILexer.h \ @@ -187,6 +188,7 @@ Document.o: \ ../src/ElapsedPeriod.h EditModel.o: \ ../src/EditModel.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -216,6 +218,7 @@ EditModel.o: \ ../src/EditModel.h Editor.o: \ ../src/Editor.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -251,6 +254,7 @@ Editor.o: \ ../src/ElapsedPeriod.h EditView.o: \ ../src/EditView.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -286,6 +290,7 @@ EditView.o: \ ../src/ElapsedPeriod.h Indicator.o: \ ../src/Indicator.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -295,13 +300,13 @@ Indicator.o: \ ../src/XPM.h KeyMap.o: \ ../src/KeyMap.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/KeyMap.h LineMarker.o: \ ../src/LineMarker.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -311,6 +316,7 @@ LineMarker.o: \ ../src/LineMarker.h MarginView.o: \ ../src/MarginView.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -343,6 +349,7 @@ MarginView.o: \ ../src/EditView.h PerLine.o: \ ../src/PerLine.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -354,6 +361,7 @@ PerLine.o: \ ../src/PerLine.h PositionCache.o: \ ../src/PositionCache.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -387,8 +395,7 @@ RESearch.o: \ ../src/RESearch.h RunStyles.o: \ ../src/RunStyles.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -397,6 +404,7 @@ RunStyles.o: \ ../src/RunStyles.h ScintillaBase.o: \ ../src/ScintillaBase.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -431,14 +439,14 @@ ScintillaBase.o: \ ../src/ScintillaBase.h Selection.o: \ ../src/Selection.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ ../src/Selection.h Style.o: \ ../src/Style.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -452,6 +460,7 @@ UniqueString.o: \ ../src/UniqueString.h ViewStyle.o: \ ../src/ViewStyle.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -465,6 +474,7 @@ ViewStyle.o: \ ../src/ViewStyle.h XPM.o: \ ../src/XPM.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../src/XPM.h diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp index 87db014ca..8c931d7e3 100644 --- a/qt/ScintillaEdit/ScintillaDocument.cpp +++ b/qt/ScintillaEdit/ScintillaDocument.cpp @@ -10,6 +10,7 @@ #include "ScintillaDocument.h" +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h index 2860e1397..2d78ff389 100644 --- a/qt/ScintillaEditBase/PlatQt.h +++ b/qt/ScintillaEditBase/PlatQt.h @@ -17,6 +17,7 @@ #include <vector> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h index dda1c6563..985c91999 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.h +++ b/qt/ScintillaEditBase/ScintillaEditBase.h @@ -18,6 +18,7 @@ #include <vector> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" #include "Scintilla.h" diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index d06fbc090..d5b1b1a18 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -28,6 +28,7 @@ #include <memory> #include "Scintilla.h" +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" #include "ILoader.h" diff --git a/scripts/HeaderOrder.txt b/scripts/HeaderOrder.txt index e560bce88..22bb82366 100644 --- a/scripts/HeaderOrder.txt +++ b/scripts/HeaderOrder.txt @@ -89,6 +89,7 @@ // Non-platform-specific headers // src platform interface +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/AutoComplete.cxx b/src/AutoComplete.cxx index 102624bbb..b4444ff0c 100644 --- a/src/AutoComplete.cxx +++ b/src/AutoComplete.cxx @@ -18,6 +18,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/CallTip.cxx b/src/CallTip.cxx index e6bfc2b7e..418088470 100644 --- a/src/CallTip.cxx +++ b/src/CallTip.cxx @@ -19,6 +19,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx index 4ddbfb718..a13d74ebf 100644 --- a/src/CellBuffer.cxx +++ b/src/CellBuffer.cxx @@ -19,8 +19,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Scintilla.h" #include "Position.h" diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index ace6ef4ef..af1c88bb7 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -15,8 +15,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Position.h" #include "UniqueString.h" diff --git a/src/Debugging.h b/src/Debugging.h new file mode 100644 index 000000000..b7ea20b98 --- /dev/null +++ b/src/Debugging.h @@ -0,0 +1,44 @@ +// Scintilla source code edit control +/** @file Debugging.h + ** Assert and debug trace functions. + ** Implemented in each platform layer. + **/ +// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef DEBUGGING_H +#define DEBUGGING_H + +namespace Scintilla { + +#if defined(__clang__) +# if __has_feature(attribute_analyzer_noreturn) +# define CLANG_ANALYZER_NORETURN __attribute__((analyzer_noreturn)) +# else +# define CLANG_ANALYZER_NORETURN +# endif +#else +# define CLANG_ANALYZER_NORETURN +#endif + +/** + * Platform namespace used to segregate debugging functions. + */ +namespace Platform { + +void DebugDisplay(const char *s) noexcept; +void DebugPrintf(const char *format, ...) noexcept; +bool ShowAssertionPopUps(bool assertionPopUps_) noexcept; +void Assert(const char *c, const char *file, int line) noexcept CLANG_ANALYZER_NORETURN; + +} + +#ifdef NDEBUG +#define PLATFORM_ASSERT(c) ((void)0) +#else +#define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Scintilla::Platform::Assert(#c, __FILE__, __LINE__)) +#endif + +} + +#endif diff --git a/src/Decoration.cxx b/src/Decoration.cxx index ce9e29d07..9a88c03dd 100644 --- a/src/Decoration.cxx +++ b/src/Decoration.cxx @@ -16,8 +16,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Scintilla.h" #include "Position.h" diff --git a/src/Document.cxx b/src/Document.cxx index f7f58bd13..564959eb0 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -25,8 +25,7 @@ #include <regex> #endif -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "ILoader.h" #include "ILexer.h" diff --git a/src/EditModel.cxx b/src/EditModel.cxx index 51d077aee..d99c0a88a 100644 --- a/src/EditModel.cxx +++ b/src/EditModel.cxx @@ -19,6 +19,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/EditView.cxx b/src/EditView.cxx index fcb747d21..b274e02ba 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -23,6 +23,7 @@ #include <memory> #include <chrono> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/Editor.cxx b/src/Editor.cxx index 56164a312..a88ec2d1c 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -23,6 +23,7 @@ #include <memory> #include <chrono> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/Indicator.cxx b/src/Indicator.cxx index 91540e14e..007f30f77 100644 --- a/src/Indicator.cxx +++ b/src/Indicator.cxx @@ -14,6 +14,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx index 938d98997..58099de8c 100644 --- a/src/KeyMap.cxx +++ b/src/KeyMap.cxx @@ -13,8 +13,7 @@ #include <map> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Scintilla.h" diff --git a/src/LineMarker.cxx b/src/LineMarker.cxx index 861ae58aa..09fe0e86d 100644 --- a/src/LineMarker.cxx +++ b/src/LineMarker.cxx @@ -16,6 +16,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/MarginView.cxx b/src/MarginView.cxx index 27b057bd4..1e4144771 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -20,6 +20,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/PerLine.cxx b/src/PerLine.cxx index e42844602..b478c7f07 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -16,6 +16,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/Platform.h b/src/Platform.h index 33116999c..5ba79a936 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -313,16 +313,6 @@ public: void Show(Point pt, const Window &w); }; -#if defined(__clang__) -# if __has_feature(attribute_analyzer_noreturn) -# define CLANG_ANALYZER_NORETURN __attribute__((analyzer_noreturn)) -# else -# define CLANG_ANALYZER_NORETURN -# endif -#else -# define CLANG_ANALYZER_NORETURN -#endif - /** * Platform namespace used to retrieve system wide parameters such as double click speed * and chrome colour. @@ -338,19 +328,8 @@ constexpr long LongFromTwoShorts(short a,short b) noexcept { return (a) | ((b) << 16); } -void DebugDisplay(const char *s) noexcept; -void DebugPrintf(const char *format, ...) noexcept; -bool ShowAssertionPopUps(bool assertionPopUps_) noexcept; -void Assert(const char *c, const char *file, int line) noexcept CLANG_ANALYZER_NORETURN; - } -#ifdef NDEBUG -#define PLATFORM_ASSERT(c) ((void)0) -#else -#define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Scintilla::Platform::Assert(#c, __FILE__, __LINE__)) -#endif - } #endif diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index 8665c19be..8ad940f5a 100644 --- a/src/PositionCache.cxx +++ b/src/PositionCache.cxx @@ -19,6 +19,7 @@ #include <iterator> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx index c61e3ca41..e36d1ff12 100644 --- a/src/RunStyles.cxx +++ b/src/RunStyles.cxx @@ -18,8 +18,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Scintilla.h" #include "Position.h" diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index b46a2207a..91abd0d85 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -18,6 +18,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/Selection.cxx b/src/Selection.cxx index 261fa81c5..5a5d998c4 100644 --- a/src/Selection.cxx +++ b/src/Selection.cxx @@ -14,8 +14,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Scintilla.h" diff --git a/src/Style.cxx b/src/Style.cxx index 85ac58738..dfeb5f1b9 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -10,6 +10,7 @@ #include <vector> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index 0a3451026..28a09016b 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -16,6 +16,7 @@ #include <algorithm> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/src/XPM.cxx b/src/XPM.cxx index 2ad21377a..a789a47d4 100644 --- a/src/XPM.cxx +++ b/src/XPM.cxx @@ -16,6 +16,7 @@ #include <iterator> #include <memory> +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/test/unit/UnitTester.cxx b/test/unit/UnitTester.cxx index 4614458db..bd4d611f8 100644 --- a/test/unit/UnitTester.cxx +++ b/test/unit/UnitTester.cxx @@ -12,8 +12,7 @@ #include <vector> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #define CATCH_CONFIG_WINDOWS_CRTDBG #define CATCH_CONFIG_RUNNER diff --git a/test/unit/testCellBuffer.cxx b/test/unit/testCellBuffer.cxx index 8ccfe136b..91844da2d 100644 --- a/test/unit/testCellBuffer.cxx +++ b/test/unit/testCellBuffer.cxx @@ -8,8 +8,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Scintilla.h" #include "Position.h" diff --git a/test/unit/testCharClassify.cxx b/test/unit/testCharClassify.cxx index 084743b3f..82d2f2a45 100644 --- a/test/unit/testCharClassify.cxx +++ b/test/unit/testCharClassify.cxx @@ -8,8 +8,7 @@ #include <memory> #include <iostream> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "CharClassify.h" diff --git a/test/unit/testContractionState.cxx b/test/unit/testContractionState.cxx index 11caae08e..66caa7927 100644 --- a/test/unit/testContractionState.cxx +++ b/test/unit/testContractionState.cxx @@ -9,8 +9,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Position.h" #include "UniqueString.h" diff --git a/test/unit/testDecoration.cxx b/test/unit/testDecoration.cxx index 75c5e9da8..29f89d684 100644 --- a/test/unit/testDecoration.cxx +++ b/test/unit/testDecoration.cxx @@ -9,8 +9,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Position.h" #include "SplitVector.h" diff --git a/test/unit/testPartitioning.cxx b/test/unit/testPartitioning.cxx index 764b34321..41278d65d 100644 --- a/test/unit/testPartitioning.cxx +++ b/test/unit/testPartitioning.cxx @@ -9,8 +9,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Position.h" #include "SplitVector.h" diff --git a/test/unit/testPerLine.cxx b/test/unit/testPerLine.cxx index e706df884..df262feee 100644 --- a/test/unit/testPerLine.cxx +++ b/test/unit/testPerLine.cxx @@ -9,8 +9,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Scintilla.h" #include "Position.h" diff --git a/test/unit/testRunStyles.cxx b/test/unit/testRunStyles.cxx index c1f36c7e7..91ce00a19 100644 --- a/test/unit/testRunStyles.cxx +++ b/test/unit/testRunStyles.cxx @@ -9,8 +9,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Position.h" #include "SplitVector.h" diff --git a/test/unit/testSparseVector.cxx b/test/unit/testSparseVector.cxx index 2ad8d6294..70c47697d 100644 --- a/test/unit/testSparseVector.cxx +++ b/test/unit/testSparseVector.cxx @@ -10,8 +10,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Position.h" #include "UniqueString.h" diff --git a/test/unit/testSplitVector.cxx b/test/unit/testSplitVector.cxx index c9d9e9b39..341495894 100644 --- a/test/unit/testSplitVector.cxx +++ b/test/unit/testSplitVector.cxx @@ -9,8 +9,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "Position.h" #include "SplitVector.h" diff --git a/test/unit/testUniConversion.cxx b/test/unit/testUniConversion.cxx index aa76869ac..5192fcf62 100644 --- a/test/unit/testUniConversion.cxx +++ b/test/unit/testUniConversion.cxx @@ -8,8 +8,7 @@ #include <algorithm> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #include "UniConversion.h" diff --git a/test/unit/unitTest.cxx b/test/unit/unitTest.cxx index fe1cc02dd..665bfb4da 100644 --- a/test/unit/unitTest.cxx +++ b/test/unit/unitTest.cxx @@ -38,8 +38,7 @@ #include <vector> #include <memory> -#include "Geometry.h" -#include "Platform.h" +#include "Debugging.h" #if defined(__GNUC__) // Want to avoid misleading indentation warnings in catch.hpp but the pragma diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index f94bf058c..cd98168e8 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -44,6 +44,7 @@ #include <dwrite.h> #endif +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" #include "XPM.h" diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index f6082b099..5893becfa 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -48,6 +48,7 @@ #include <dwrite.h> #endif +#include "Debugging.h" #include "Geometry.h" #include "Platform.h" diff --git a/win32/deps.mak b/win32/deps.mak index 0fc2a72c9..71978a153 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -5,6 +5,7 @@ HanjaDic.o: \ HanjaDic.h PlatWin.o: \ PlatWin.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../src/XPM.h \ @@ -19,6 +20,7 @@ ScintillaDLL.o: \ ScintillaWin.h ScintillaWin.o: \ ScintillaWin.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -59,6 +61,7 @@ ScintillaWin.o: \ ScintillaWin.h AutoComplete.o: \ ../src/AutoComplete.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -68,6 +71,7 @@ AutoComplete.o: \ ../src/AutoComplete.h CallTip.o: \ ../src/CallTip.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -85,8 +89,7 @@ CaseFolder.o: \ ../src/CaseConvert.h CellBuffer.o: \ ../src/CellBuffer.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -106,8 +109,7 @@ CharClassify.o: \ ../src/CharClassify.h ContractionState.o: \ ../src/ContractionState.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -120,8 +122,7 @@ DBCS.o: \ ../src/DBCS.h Decoration.o: \ ../src/Decoration.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -131,8 +132,7 @@ Decoration.o: \ ../src/Decoration.h Document.o: \ ../src/Document.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/ILoader.h \ ../include/Sci_Position.h \ ../include/ILexer.h \ @@ -154,6 +154,7 @@ Document.o: \ ../src/ElapsedPeriod.h EditModel.o: \ ../src/EditModel.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -183,6 +184,7 @@ EditModel.o: \ ../src/EditModel.h Editor.o: \ ../src/Editor.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -218,6 +220,7 @@ Editor.o: \ ../src/ElapsedPeriod.h EditView.o: \ ../src/EditView.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -253,6 +256,7 @@ EditView.o: \ ../src/ElapsedPeriod.h Indicator.o: \ ../src/Indicator.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -262,13 +266,13 @@ Indicator.o: \ ../src/XPM.h KeyMap.o: \ ../src/KeyMap.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/KeyMap.h LineMarker.o: \ ../src/LineMarker.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -278,6 +282,7 @@ LineMarker.o: \ ../src/LineMarker.h MarginView.o: \ ../src/MarginView.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -310,6 +315,7 @@ MarginView.o: \ ../src/EditView.h PerLine.o: \ ../src/PerLine.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -321,6 +327,7 @@ PerLine.o: \ ../src/PerLine.h PositionCache.o: \ ../src/PositionCache.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -354,8 +361,7 @@ RESearch.o: \ ../src/RESearch.h RunStyles.o: \ ../src/RunStyles.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -364,6 +370,7 @@ RunStyles.o: \ ../src/RunStyles.h ScintillaBase.o: \ ../src/ScintillaBase.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -398,6 +405,7 @@ ScintillaBase.o: \ ../src/ScintillaBase.h ScintillaBaseL.o: \ ../src/ScintillaBase.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -432,14 +440,14 @@ ScintillaBaseL.o: \ ../src/ScintillaBase.h Selection.o: \ ../src/Selection.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ ../src/Selection.h Style.o: \ ../src/Style.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -453,6 +461,7 @@ UniqueString.o: \ ../src/UniqueString.h ViewStyle.o: \ ../src/ViewStyle.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -466,6 +475,7 @@ ViewStyle.o: \ ../src/ViewStyle.h XPM.o: \ ../src/XPM.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../src/XPM.h diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak index e89b28eaf..601f10acd 100644 --- a/win32/nmdeps.mak +++ b/win32/nmdeps.mak @@ -5,6 +5,7 @@ $(DIR_O)/HanjaDic.obj: \ HanjaDic.h $(DIR_O)/PlatWin.obj: \ PlatWin.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../src/XPM.h \ @@ -19,6 +20,7 @@ $(DIR_O)/ScintillaDLL.obj: \ ScintillaWin.h $(DIR_O)/ScintillaWin.obj: \ ScintillaWin.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -59,6 +61,7 @@ $(DIR_O)/ScintillaWin.obj: \ ScintillaWin.h $(DIR_O)/AutoComplete.obj: \ ../src/AutoComplete.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -68,6 +71,7 @@ $(DIR_O)/AutoComplete.obj: \ ../src/AutoComplete.h $(DIR_O)/CallTip.obj: \ ../src/CallTip.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -85,8 +89,7 @@ $(DIR_O)/CaseFolder.obj: \ ../src/CaseConvert.h $(DIR_O)/CellBuffer.obj: \ ../src/CellBuffer.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -106,8 +109,7 @@ $(DIR_O)/CharClassify.obj: \ ../src/CharClassify.h $(DIR_O)/ContractionState.obj: \ ../src/ContractionState.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -120,8 +122,7 @@ $(DIR_O)/DBCS.obj: \ ../src/DBCS.h $(DIR_O)/Decoration.obj: \ ../src/Decoration.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -131,8 +132,7 @@ $(DIR_O)/Decoration.obj: \ ../src/Decoration.h $(DIR_O)/Document.obj: \ ../src/Document.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/ILoader.h \ ../include/Sci_Position.h \ ../include/ILexer.h \ @@ -154,6 +154,7 @@ $(DIR_O)/Document.obj: \ ../src/ElapsedPeriod.h $(DIR_O)/EditModel.obj: \ ../src/EditModel.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -183,6 +184,7 @@ $(DIR_O)/EditModel.obj: \ ../src/EditModel.h $(DIR_O)/Editor.obj: \ ../src/Editor.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -218,6 +220,7 @@ $(DIR_O)/Editor.obj: \ ../src/ElapsedPeriod.h $(DIR_O)/EditView.obj: \ ../src/EditView.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -253,6 +256,7 @@ $(DIR_O)/EditView.obj: \ ../src/ElapsedPeriod.h $(DIR_O)/Indicator.obj: \ ../src/Indicator.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -262,13 +266,13 @@ $(DIR_O)/Indicator.obj: \ ../src/XPM.h $(DIR_O)/KeyMap.obj: \ ../src/KeyMap.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/KeyMap.h $(DIR_O)/LineMarker.obj: \ ../src/LineMarker.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -278,6 +282,7 @@ $(DIR_O)/LineMarker.obj: \ ../src/LineMarker.h $(DIR_O)/MarginView.obj: \ ../src/MarginView.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -310,6 +315,7 @@ $(DIR_O)/MarginView.obj: \ ../src/EditView.h $(DIR_O)/PerLine.obj: \ ../src/PerLine.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -321,6 +327,7 @@ $(DIR_O)/PerLine.obj: \ ../src/PerLine.h $(DIR_O)/PositionCache.obj: \ ../src/PositionCache.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -354,8 +361,7 @@ $(DIR_O)/RESearch.obj: \ ../src/RESearch.h $(DIR_O)/RunStyles.obj: \ ../src/RunStyles.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ @@ -364,6 +370,7 @@ $(DIR_O)/RunStyles.obj: \ ../src/RunStyles.h $(DIR_O)/ScintillaBase.obj: \ ../src/ScintillaBase.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -398,6 +405,7 @@ $(DIR_O)/ScintillaBase.obj: \ ../src/ScintillaBase.h $(DIR_O)/ScintillaBaseL.obj: \ ../src/ScintillaBase.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/ILoader.h \ @@ -432,14 +440,14 @@ $(DIR_O)/ScintillaBaseL.obj: \ ../src/ScintillaBase.h $(DIR_O)/Selection.obj: \ ../src/Selection.cxx \ - ../src/Geometry.h \ - ../src/Platform.h \ + ../src/Debugging.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ ../src/Position.h \ ../src/Selection.h $(DIR_O)/Style.obj: \ ../src/Style.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -453,6 +461,7 @@ $(DIR_O)/UniqueString.obj: \ ../src/UniqueString.h $(DIR_O)/ViewStyle.obj: \ ../src/ViewStyle.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../include/Scintilla.h \ @@ -466,6 +475,7 @@ $(DIR_O)/ViewStyle.obj: \ ../src/ViewStyle.h $(DIR_O)/XPM.obj: \ ../src/XPM.cxx \ + ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../src/XPM.h |