From 1d98d983006463848903d9c3e25c8c69912d662d Mon Sep 17 00:00:00 2001 From: Don Ho Date: Tue, 1 Nov 2022 12:52:06 +0100 Subject: [PATCH] Fix crash regression due to ABI incompatibility Fix the regression due to the following commit: https://github.com/notepad-plus-plus/notepad-plus-plus/commit/3e9413d6152db40e1cf31ecc8f2dd057451c998f Modify type of "PositionCR" to "int64_t" from "long" again, to keep ABI compatible to plugins. Ref: https://github.com/notepad-plus-plus/notepad-plus-plus/pull/12327#issuecomment-1297906305 --- scintilla/include/Sci_Position.h | 2 +- scintilla/include/ScintillaStructures.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scintilla/include/Sci_Position.h b/scintilla/include/Sci_Position.h index abd0f3408..88ad5132b 100644 --- a/scintilla/include/Sci_Position.h +++ b/scintilla/include/Sci_Position.h @@ -18,7 +18,7 @@ typedef ptrdiff_t Sci_Position; typedef size_t Sci_PositionU; // For Sci_CharacterRange which is defined as long to be compatible with Win32 CHARRANGE -typedef long Sci_PositionCR; +typedef intptr_t Sci_PositionCR; #ifdef _WIN32 #define SCI_METHOD __stdcall diff --git a/scintilla/include/ScintillaStructures.h b/scintilla/include/ScintillaStructures.h index 4d13a4367..4586f86b5 100644 --- a/scintilla/include/ScintillaStructures.h +++ b/scintilla/include/ScintillaStructures.h @@ -12,7 +12,7 @@ namespace Scintilla { -using PositionCR = long; +using PositionCR = intptr_t; struct CharacterRange { PositionCR cpMin;