3 files changed, 16 insertions, 16 deletions
diff --git a/src/Edit.c b/src/Edit.c
index baf9d41..d605e24 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -321,7 +321,7 @@ void EditSetNewText(HWND hwnd,char* lpstrText,DWORD cbText)
 //
 BOOL EditConvertText(HWND hwnd,UINT cpSource,UINT cpDest,BOOL bSetSavePoint)
 {
-  struct TextRange tr = { { 0, -1 }, NULL };
+  struct Sci_TextRange tr = { { 0, -1 }, NULL };
   int length, cbText, cbwText;
   char *pchText;
   WCHAR *pwchText;
@@ -2357,7 +2357,7 @@ void EditTabsToSpaces(HWND hwnd,int nTabWidth,BOOL bOnlyIndentingWS)
   int iSelEnd;
   int iSelCount;
   UINT cpEdit;
-  struct TextRange tr;
+  struct Sci_TextRange tr;
   BOOL bIsLineStart = TRUE;
   BOOL bModified = FALSE;
 
@@ -2492,7 +2492,7 @@ void EditSpacesToTabs(HWND hwnd,int nTabWidth,BOOL bOnlyIndentingWS)
   int iSelEnd;
   int iSelCount;
   UINT cpEdit;
-  struct TextRange tr;
+  struct Sci_TextRange tr;
   WCHAR space[256];
   BOOL bIsLineStart = TRUE;
   BOOL bModified = FALSE;
@@ -3506,7 +3506,7 @@ void EditToggleLineComments(HWND hwnd,LPCWSTR pwszComment,BOOL bInsertAtStart)
       int iCommentPos;
       int iIndentPos = (int)SendMessage(hwnd,SCI_GETLINEINDENTPOSITION,(WPARAM)iLine,0);
       char tchBuf[32];
-      struct TextRange tr;
+      struct Sci_TextRange tr;
 
       if (iIndentPos == SendMessage(hwnd,SCI_GETLINEENDPOSITION,(WPARAM)iLine,0))
         continue;
@@ -4042,7 +4042,7 @@ void EditWrapToColumn(HWND hwnd,int nColumn/*,int nTabWidth*/)
   int iSelEnd;
   int iSelCount;
   UINT cpEdit;
-  struct TextRange tr;
+  struct Sci_TextRange tr;
   int   cEOLMode;
   WCHAR wszEOL[] = L"\r\n";
   int   cchEOL = 2;
@@ -4252,7 +4252,7 @@ void EditJoinLinesEx(HWND hwnd)
   int iSelStart;
   int iSelEnd;
   int iSelCount;
-  struct TextRange tr;
+  struct Sci_TextRange tr;
   int  cEOLMode;
   char szEOL[] = "\r\n";
   int  cchEOL = 2;
@@ -4788,7 +4788,7 @@ void EditGetExcerpt(HWND hwnd,LPWSTR lpszExcerpt,DWORD cchExcerpt)
   WCHAR *p;
   DWORD cch = 0;
   UINT cpEdit;
-  struct TextRange tr;
+  struct Sci_TextRange tr;
   char*  pszText;
   LPWSTR pszTextW;
 
@@ -5409,7 +5409,7 @@ HWND EditFindReplaceDlg(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bReplace)
 BOOL EditFindNext(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL fExtendSelection)
 {
 
-  struct TextToFind ttf;
+  struct Sci_TextToFind ttf;
   int iPos;
   int iSelPos, iSelAnchor;
   char szFind2[512];
@@ -5478,7 +5478,7 @@ BOOL EditFindNext(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL fExtendSelection)
 BOOL EditFindPrev(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL fExtendSelection)
 {
 
-  struct TextToFind ttf;
+  struct Sci_TextToFind ttf;
   int iPos;
   int iSelPos, iSelAnchor;
   int iLength;
@@ -5549,7 +5549,7 @@ BOOL EditFindPrev(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL fExtendSelection)
 BOOL EditReplace(HWND hwnd,LPCEDITFINDREPLACE lpefr)
 {
 
-  struct TextToFind ttf;
+  struct Sci_TextToFind ttf;
   int iPos;
   int iSelStart;
   int iSelEnd;
@@ -5684,7 +5684,7 @@ void CompleteWord(HWND hwnd, BOOL autoInsert) {
   int iRootLen = 0;
   int iDocLen;
   int iPosFind;
-  struct TextRange tr = { { 0, -1 }, NULL };
+  struct Sci_TextRange tr = { { 0, -1 }, NULL };
   struct Sci_TextToFind ft = {{0, 0}, 0, {0, 0}};
   BOOL bWordAllNumbers = TRUE;
   struct WLIST* lListHead = NULL;
@@ -5804,7 +5804,7 @@ void CompleteWord(HWND hwnd, BOOL autoInsert) {
 //
 void EditMarkAll(HWND hwnd, int iMarkOccurrences, BOOL bMarkOccurrencesMatchCase, BOOL bMarkOccurrencesMatchWords)
 {
-  struct TextToFind ttf;
+  struct Sci_TextToFind ttf;
   int iPos;
   char *pszText;
   int iTextLen;
@@ -5891,7 +5891,7 @@ void EditMarkAll(HWND hwnd, int iMarkOccurrences, BOOL bMarkOccurrencesMatchCase
 BOOL EditReplaceAll(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bShowInfo)
 {
 
-  struct TextToFind ttf;
+  struct Sci_TextToFind ttf;
   int iPos;
   int iCount = 0;
   int iReplaceMsg = (lpefr->fuFlags & SCFIND_REGEXP) ? SCI_REPLACETARGETRE : SCI_REPLACETARGET;
@@ -6016,7 +6016,7 @@ BOOL EditReplaceAll(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bShowInfo)
 BOOL EditReplaceAllInSelection(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bShowInfo)
 {
 
-  struct TextToFind ttf;
+  struct Sci_TextToFind ttf;
   int iPos;
   int iCount = 0;
   int iReplaceMsg = (lpefr->fuFlags & SCFIND_REGEXP) ? SCI_REPLACETARGETRE : SCI_REPLACETARGET;
diff --git a/src/Notepad2.c b/src/Notepad2.c
index 2d44c28..4f26aa8 100644
--- a/src/Notepad2.c
+++ b/src/Notepad2.c
@@ -5263,7 +5263,7 @@ LRESULT MsgNotify(HWND hwnd,WPARAM wParam,LPARAM lParam)
 
               if (iSize >= 3) {
 
-                struct TextRange tr = { { iStartPos, iCurPos }, tchBuf };
+                struct Sci_TextRange tr = { { iStartPos, iCurPos }, tchBuf };
                 SendMessage(hwndEdit,SCI_GETTEXTRANGE,0,(LPARAM)&tr);
 
                 if (tchBuf[iSize - 2] != '/') {
diff --git a/src/Print.cpp b/src/Print.cpp
index 616d26d..40f4977 100644
--- a/src/Print.cpp
+++ b/src/Print.cpp
@@ -110,7 +110,7 @@ extern "C" BOOL EditPrint(HWND hwnd,LPCWSTR pszDocTitle,LPCWSTR pszPageFormat)
   int lengthDocMax;
   int lengthPrinted;
 
-  struct RangeToFormat frPrint;
+  struct Sci_RangeToFormat frPrint;
 
   int pageNum;
   BOOL printPage;