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;