OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
42d8aa1
)
Fix some warnings
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sun, 24 Jul 2016 12:51:26 +0000
(21:51 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sun, 24 Jul 2016 12:51:26 +0000
(21:51 +0900)
Externals/crystaledit/editlib/ccrystaltextbuffer.cpp
patch
|
blob
|
history
Externals/crystaledit/editlib/ccrystaltextview.cpp
patch
|
blob
|
history
Externals/crystaledit/editlib/ccrystaltextview.h
patch
|
blob
|
history
Externals/crystaledit/editlib/ccrystaltextview2.cpp
patch
|
blob
|
history
Src/GhostTextBuffer.cpp
patch
|
blob
|
history
Src/LoadSaveCodepageDlg.cpp
patch
|
blob
|
history
Src/Merge.vcxproj
patch
|
blob
|
history
Src/PropCodepage.cpp
patch
|
blob
|
history
Src/diffutils/src/analyze.c
patch
|
blob
|
history
Src/diffutils/src/io.c
patch
|
blob
|
history
diff --git
a/Externals/crystaledit/editlib/ccrystaltextbuffer.cpp
b/Externals/crystaledit/editlib/ccrystaltextbuffer.cpp
index
91c65f4
..
d435c8a
100644
(file)
--- a/
Externals/crystaledit/editlib/ccrystaltextbuffer.cpp
+++ b/
Externals/crystaledit/editlib/ccrystaltextbuffer.cpp
@@
-646,13
+646,12
@@
applyEOLMode()
{
LPCTSTR lpEOLtoApply = GetDefaultEol();
bool bChanged = false;
{
LPCTSTR lpEOLtoApply = GetDefaultEol();
bool bChanged = false;
- const size_t size = m_aLines.size();
- for (size_t i = 0 ; i < size; i++)
+ for (size_t i = 0 ; i < m_aLines.size(); i++)
{
// the last real line has no EOL
if (!m_aLines[i].HasEol())
continue;
{
// the last real line has no EOL
if (!m_aLines[i].HasEol())
continue;
- bChanged |= ChangeLineEol(
i
, lpEOLtoApply);
+ bChanged |= ChangeLineEol(
static_cast<int>(i)
, lpEOLtoApply);
}
if (bChanged)
}
if (bChanged)
@@
-1305,7
+1304,7
@@
GetRedoActionCode (int & nAction, POSITION pos /*= NULL*/ ) const
// Advance to next undo group
nPosition++;
// Advance to next undo group
nPosition++;
- if (nPosition <
m_aUndoBuf.size (
))
+ if (nPosition <
static_cast<intptr_t>(m_aUndoBuf.size ()
))
{
std::vector<UndoRecord>::const_iterator iter = m_aUndoBuf.begin () + nPosition;
while (iter != m_aUndoBuf.end () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0)
{
std::vector<UndoRecord>::const_iterator iter = m_aUndoBuf.begin () + nPosition;
while (iter != m_aUndoBuf.end () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0)
@@
-1314,7
+1313,7
@@
GetRedoActionCode (int & nAction, POSITION pos /*= NULL*/ ) const
++nPosition;
}
}
++nPosition;
}
}
- if (nPosition >=
m_aUndoBuf.size (
))
+ if (nPosition >=
static_cast<intptr_t>(m_aUndoBuf.size ()
))
return NULL; // No more redo actions!
return (POSITION) nPosition;
return NULL; // No more redo actions!
return (POSITION) nPosition;
diff --git
a/Externals/crystaledit/editlib/ccrystaltextview.cpp
b/Externals/crystaledit/editlib/ccrystaltextview.cpp
index
9b90e42
..
bd6c90e
100644
(file)
--- a/
Externals/crystaledit/editlib/ccrystaltextview.cpp
+++ b/
Externals/crystaledit/editlib/ccrystaltextview.cpp
@@
-5403,9
+5403,9
@@
OnFilePageSetup ()
* This functions adds bookmark or removes bookmark on given line.
* @param [in] Index (0-based) of line to add/remove bookmark.
*/
* This functions adds bookmark or removes bookmark on given line.
* @param [in] Index (0-based) of line to add/remove bookmark.
*/
-void CCrystalTextView::ToggleBookmark(
UINT
nLine)
+void CCrystalTextView::ToggleBookmark(
int
nLine)
{
{
- ASSERT(nLine < GetLineCount());
+ ASSERT(nLine
>= 0 && nLine
< GetLineCount());
if (m_pTextBuffer != NULL)
{
DWORD dwFlags = GetLineFlags (nLine);
if (m_pTextBuffer != NULL)
{
DWORD dwFlags = GetLineFlags (nLine);
@@
-5562,7
+5562,7
@@
GetViewLineNumbers () const
* biggest number fits.
* @return Margin area width in pixels.
*/
* biggest number fits.
* @return Margin area width in pixels.
*/
-
UINT
CCrystalTextView::
+
int
CCrystalTextView::
GetMarginWidth (CDC *pdc)
{
int nMarginWidth = 0;
GetMarginWidth (CDC *pdc)
{
int nMarginWidth = 0;
diff --git
a/Externals/crystaledit/editlib/ccrystaltextview.h
b/Externals/crystaledit/editlib/ccrystaltextview.h
index
2ad9ac6
..
df3cef9
100644
(file)
--- a/
Externals/crystaledit/editlib/ccrystaltextview.h
+++ b/
Externals/crystaledit/editlib/ccrystaltextview.h
@@
-195,7
+195,7
@@
protected:
bool IsInsideSelBlock (CPoint ptTextPos);
bool m_bBookmarkExist; // More bookmarks
bool IsInsideSelBlock (CPoint ptTextPos);
bool m_bBookmarkExist; // More bookmarks
- void ToggleBookmark(
UINT
nLine);
+ void ToggleBookmark(
int
nLine);
public :
virtual void ResetView ();
public :
virtual void ResetView ();
@@
-220,7
+220,7
@@
protected :
CPoint m_ptDraggedTextBegin, m_ptDraggedTextEnd;
void UpdateCaret ();
void SetAnchor (const CPoint & ptNewAnchor);
CPoint m_ptDraggedTextBegin, m_ptDraggedTextEnd;
void UpdateCaret ();
void SetAnchor (const CPoint & ptNewAnchor);
-
UINT
GetMarginWidth (CDC *pdc = NULL);
+
int
GetMarginWidth (CDC *pdc = NULL);
bool IsValidTextPos (const CPoint &point);
bool IsValidTextPosX (const CPoint &point);
bool IsValidTextPosY (const CPoint &point);
bool IsValidTextPos (const CPoint &point);
bool IsValidTextPosX (const CPoint &point);
bool IsValidTextPosY (const CPoint &point);
diff --git
a/Externals/crystaledit/editlib/ccrystaltextview2.cpp
b/Externals/crystaledit/editlib/ccrystaltextview2.cpp
index
7d99c30
..
546d45b
100644
(file)
--- a/
Externals/crystaledit/editlib/ccrystaltextview2.cpp
+++ b/
Externals/crystaledit/editlib/ccrystaltextview2.cpp
@@
-1150,7
+1150,7
@@
PutToClipboard (LPCTSTR pszText, int cchText, bool bColumnSelection)
HGLOBAL hData = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE, cbData);
if (hData != NULL)
{
HGLOBAL hData = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE, cbData);
if (hData != NULL)
{
-
DWORD
dwSize = GlobalSize(hData);
+
SIZE_T
dwSize = GlobalSize(hData);
LPTSTR pszData = (LPTSTR)::GlobalLock (hData);
memcpy (pszData, pszText, cbData);
if (dwSize > cbData)
LPTSTR pszData = (LPTSTR)::GlobalLock (hData);
memcpy (pszData, pszText, cbData);
if (dwSize > cbData)
diff --git
a/Src/GhostTextBuffer.cpp
b/Src/GhostTextBuffer.cpp
index
88cbcb9
..
ab85936
100644
(file)
--- a/
Src/GhostTextBuffer.cpp
+++ b/
Src/GhostTextBuffer.cpp
@@
-68,7
+68,7
@@
bool CGhostTextBuffer::InternalInsertGhostLine (CCrystalTextView * pSource,
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- ASSERT (nLine >= 0 && nLine <=
m_aLines.size (
));
+ ASSERT (nLine >= 0 && nLine <=
static_cast<intptr_t>(m_aLines.size ()
));
CInsertContext context;
context.m_ptStart.x = 0;
CInsertContext context;
context.m_ptStart.x = 0;
@@
-96,7
+96,7
@@
bool CGhostTextBuffer::InternalDeleteGhostLine (CCrystalTextView * pSource,
{
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
{
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- ASSERT (nLine >= 0 && nLine <=
m_aLines.size (
));
+ ASSERT (nLine >= 0 && nLine <=
static_cast<intptr_t>(m_aLines.size ()
));
if (nCount == 0)
return true;
if (nCount == 0)
return true;
@@
-154,9
+154,9
@@
void CGhostTextBuffer::GetTextWithoutEmptys(int nStartLine, int nStartChar,
bool bExcludeInvisibleLines/*=true*/)
{
const size_t lines = m_aLines.size();
bool bExcludeInvisibleLines/*=true*/)
{
const size_t lines = m_aLines.size();
- ASSERT(nStartLine >= 0 && nStartLine <
lines
);
+ ASSERT(nStartLine >= 0 && nStartLine <
static_cast<intptr_t>(lines)
);
ASSERT(nStartChar >= 0 && nStartChar <= GetLineLength(nStartLine));
ASSERT(nStartChar >= 0 && nStartChar <= GetLineLength(nStartLine));
- ASSERT(nEndLine >= 0 && nEndLine <
lines
);
+ ASSERT(nEndLine >= 0 && nEndLine <
static_cast<intptr_t>(lines)
);
ASSERT(nEndChar >= 0 && nEndChar <= GetFullLineLength(nEndLine));
ASSERT(nStartLine < nEndLine || nStartLine == nEndLine && nStartChar <= nEndChar);
// some edit functions (copy...) should do nothing when there is no selection.
ASSERT(nEndChar >= 0 && nEndChar <= GetFullLineLength(nEndLine));
ASSERT(nStartLine < nEndLine || nStartLine == nEndLine && nStartChar <= nEndChar);
// some edit functions (copy...) should do nothing when there is no selection.
diff --git
a/Src/LoadSaveCodepageDlg.cpp
b/Src/LoadSaveCodepageDlg.cpp
index
a16dba2
..
6b96b97
100644
(file)
--- a/
Src/LoadSaveCodepageDlg.cpp
+++ b/
Src/LoadSaveCodepageDlg.cpp
@@
-87,16
+87,15
@@
BOOL CLoadSaveCodepageDlg::OnInitDialog()
combol.Attach(::GetDlgItem(m_hWnd, IDC_LOAD_CODEPAGE_TEXTBOX));
combos.Attach(::GetDlgItem(m_hWnd, IDC_SAVE_CODEPAGE_TEXTBOX));
std::vector<CodePageInfo> cpi = pexconv->enumCodePages();
combol.Attach(::GetDlgItem(m_hWnd, IDC_LOAD_CODEPAGE_TEXTBOX));
combos.Attach(::GetDlgItem(m_hWnd, IDC_SAVE_CODEPAGE_TEXTBOX));
std::vector<CodePageInfo> cpi = pexconv->enumCodePages();
- int i, j;
- for (i = 0, j = 0; i < cpi.size(); i++)
+ for (size_t i = 0, j = 0; i < cpi.size(); i++)
{
String desc = string_format(_T("%05d - %s"), cpi[i].codepage, cpi[i].desc.c_str());
combol.AddString(desc.c_str());
combos.AddString(desc.c_str());
if (cpi[i].codepage == m_nLoadCodepage)
{
{
String desc = string_format(_T("%05d - %s"), cpi[i].codepage, cpi[i].desc.c_str());
combol.AddString(desc.c_str());
combos.AddString(desc.c_str());
if (cpi[i].codepage == m_nLoadCodepage)
{
- combol.SetCurSel(
j
);
- combos.SetCurSel(
j
);
+ combol.SetCurSel(
static_cast<int>(j)
);
+ combos.SetCurSel(
static_cast<int>(j)
);
}
j++;
}
}
j++;
}
diff --git
a/Src/Merge.vcxproj
b/Src/Merge.vcxproj
index
9c1f07e
..
4155938
100644
(file)
--- a/
Src/Merge.vcxproj
+++ b/
Src/Merge.vcxproj
@@
-104,7
+104,7
@@
<Optimization>MinSpace</Optimization>
\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
\r
<AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<Optimization>MinSpace</Optimization>
\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
\r
<AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
- <PreprocessorDefinitions>WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;
_CRT_NONSTDC_NO_WARNINGS;
POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<StringPooling>true</StringPooling>
\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<StringPooling>true</StringPooling>
\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
@@
-161,7
+161,7
@@
<Optimization>MinSpace</Optimization>
\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
\r
<AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<Optimization>MinSpace</Optimization>
\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
\r
<AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
- <PreprocessorDefinitions>WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;
_CRT_NONSTDC_NO_WARNINGS;
POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<StringPooling>true</StringPooling>
\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<StringPooling>true</StringPooling>
\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
@@
-213,7
+213,7
@@
<AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>
\r
<Optimization>Disabled</Optimization>
\r
<AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>
\r
<Optimization>Disabled</Optimization>
\r
<AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
- <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_
CRT_NONSTDC_NO_WARNINGS;_
AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<PrecompiledHeader>Use</PrecompiledHeader>
\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<PrecompiledHeader>Use</PrecompiledHeader>
\r
@@
-266,7
+266,7
@@
<AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>
\r
<Optimization>Disabled</Optimization>
\r
<AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<AdditionalOptions>/EHa %(AdditionalOptions)</AdditionalOptions>
\r
<Optimization>Disabled</Optimization>
\r
<AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
- <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;_STATIC_CPPLIB;_CRT_SECURE_NO_WARNINGS;
_CRT_NONSTDC_NO_WARNINGS;
POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<PrecompiledHeader>Use</PrecompiledHeader>
\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<PrecompiledHeader>Use</PrecompiledHeader>
\r
diff --git
a/Src/PropCodepage.cpp
b/Src/PropCodepage.cpp
index
90274a1
..
53d194d
100644
(file)
--- a/
Src/PropCodepage.cpp
+++ b/
Src/PropCodepage.cpp
@@
-113,20
+113,19
@@
BOOL PropCodepage::OnInitDialog()
if (pexconv != NULL)
{
std::vector<CodePageInfo> cpi = pexconv->enumCodePages();
if (pexconv != NULL)
{
std::vector<CodePageInfo> cpi = pexconv->enumCodePages();
- int i, j;
- for (i = 0, j = 0; i < cpi.size(); i++)
+ for (size_t i = 0, j = 0; i < cpi.size(); i++)
{
if (cpi[i].codepage == 1200 /* UNICODE */)
continue;
String desc = string_format(_T("%05d - %s"), cpi[i].codepage, cpi[i].desc.c_str());
m_comboCustomCodepageValue.AddString(desc.c_str());
if (cpi[i].codepage == m_nCustomCodepageValue)
{
if (cpi[i].codepage == 1200 /* UNICODE */)
continue;
String desc = string_format(_T("%05d - %s"), cpi[i].codepage, cpi[i].desc.c_str());
m_comboCustomCodepageValue.AddString(desc.c_str());
if (cpi[i].codepage == m_nCustomCodepageValue)
- m_comboCustomCodepageValue.SetCurSel(
j
);
+ m_comboCustomCodepageValue.SetCurSel(
static_cast<int>(j)
);
j++;
}
static int autodetectTypeList[] = {50001, 50936, 50950, 50932, 50949};
j++;
}
static int autodetectTypeList[] = {50001, 50936, 50950, 50932, 50949};
- for (i = 0; i < sizeof(autodetectTypeList)/sizeof(int); i++)
+ for (
size_t
i = 0; i < sizeof(autodetectTypeList)/sizeof(int); i++)
{
String desc;
pexconv->getCodepageDescription(autodetectTypeList[i], desc);
{
String desc;
pexconv->getCodepageDescription(autodetectTypeList[i], desc);
diff --git
a/Src/diffutils/src/analyze.c
b/Src/diffutils/src/analyze.c
index
ff5b21d
..
9ec778a
100644
(file)
--- a/
Src/diffutils/src/analyze.c
+++ b/
Src/diffutils/src/analyze.c
@@
-32,6
+32,9
@@
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "diff.h"
#include "cmpbuf.h"
#include "diff.h"
#include "cmpbuf.h"
+#ifdef _WIN32
+# include <io.h>
+#endif
DECL_TLS int no_discards;
DECL_TLS int need_free_buffers=0;
DECL_TLS int no_discards;
DECL_TLS int need_free_buffers=0;
diff --git
a/Src/diffutils/src/io.c
b/Src/diffutils/src/io.c
index
904dc03
..
75d7f4f
100644
(file)
--- a/
Src/diffutils/src/io.c
+++ b/
Src/diffutils/src/io.c
@@
-18,6
+18,9
@@
along with GNU DIFF; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "diff.h"
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "diff.h"
+#ifdef _WIN32
+# include <io.h>
+#endif
/* Rotate a value n bits to the left. */
#define UINT_BIT (sizeof (unsigned) * CHAR_BIT)
/* Rotate a value n bits to the left. */
#define UINT_BIT (sizeof (unsigned) * CHAR_BIT)