PATCH: [ 1547190 ] Fix VS2005 compile

diff --git a/Src/Changes.txt b/Src/Changes.txt
index a1a7e7c..304737a 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,10 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-08-27 Kimmo
+ PATCH: [ 1547190 ] Fix VS2005 compile
+  Src: MergeArgs.cpp
+
 2006-08-26 Gal
  BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
   Src/Languages/*/Merge*.rc

diff --git a/Src/MergeArgs.cpp b/Src/MergeArgs.cpp
index 3ff7781..dca6c8b 100644 (file)
--- a/Src/MergeArgs.cpp
+++ b/Src/MergeArgs.cpp
@@ -212,7 +212,8 @@ CMergeApp::ParseArgs(int argc, TCHAR *argv[], CMainFrame* pMainFrame, CStringArr
 
        // Handle all switches in the f_ArgSettings table
        // this are arguments mapped to WinMerge options
-       for (int i = 0; i < countof(f_ArgSettings); ++i)
+       int i;
+       for (i = 0; i < countof(f_ArgSettings); ++i)
        {
                const ArgSetting & argSetting = f_ArgSettings[i];
                LPCTSTR cmdargName = argSetting.CmdArgName;