more correct version of compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@9599 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 11 insertions, 18 deletions

diff --git a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj
index 48f3e00614..8aaad5e783 100644
--- a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj
+++ b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj
@@ -177,7 +177,7 @@
     <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="src\compat.h" />

+    <ClInclude Include="src\Compat\compat.h" />

     <ClInclude Include="src\Minizip\crypt.h" />

     <ClInclude Include="src\Minizip\ioapi.h" />

     <ClInclude Include="src\Minizip\iowin32.h" />

@@ -192,7 +192,6 @@
   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\checksum.cpp" />

-    <ClCompile Include="src\DlgListNew.cpp" />

     <ClCompile Include="src\DlgUpdate.cpp" />

     <ClCompile Include="src\Events.cpp" />

     <ClCompile Include="src\Minizip\ioapi.c">

diff --git a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters
index 7d5832ef80..9a8781ff63 100644
--- a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters
+++ b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters
@@ -59,7 +59,7 @@
     <ClInclude Include="src\Minizip\zlib.h">

       <Filter>Source Files\Minizip</Filter>

     </ClInclude>

-    <ClInclude Include="src\compat.h">

+    <ClInclude Include="src\Compat\compat.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

@@ -97,9 +97,6 @@
     <ClCompile Include="src\DlgUpdate.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\DlgListNew.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <None Include="res\menu.ico">

diff --git a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj
index 933a29d280..2506d85204 100644
--- a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj
+++ b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj
@@ -169,7 +169,7 @@
     <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="src\compat.h" />

+    <ClInclude Include="src\Compat\compat.h" />

     <ClInclude Include="src\Minizip\crypt.h" />

     <ClInclude Include="src\Minizip\ioapi.h" />

     <ClInclude Include="src\Minizip\iowin32.h" />

@@ -184,7 +184,6 @@
   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\checksum.cpp" />

-    <ClCompile Include="src\DlgListNew.cpp" />

     <ClCompile Include="src\DlgUpdate.cpp" />

     <ClCompile Include="src\Events.cpp" />

     <ClCompile Include="src\Minizip\ioapi.c">

diff --git a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters
index 7d5832ef80..9a8781ff63 100644
--- a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters
+++ b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters
@@ -59,7 +59,7 @@
     <ClInclude Include="src\Minizip\zlib.h">

       <Filter>Source Files\Minizip</Filter>

     </ClInclude>

-    <ClInclude Include="src\compat.h">

+    <ClInclude Include="src\Compat\compat.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

@@ -97,9 +97,6 @@
     <ClCompile Include="src\DlgUpdate.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\DlgListNew.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <None Include="res\menu.ico">

diff --git a/plugins/PluginUpdater/src/Compat/compat.h b/plugins/PluginUpdater/src/Compat/compat.h
index e46bdc2354..6afc901e17 100644
--- a/plugins/PluginUpdater/src/Compat/compat.h
+++ b/plugins/PluginUpdater/src/Compat/compat.h
@@ -1,5 +1,3 @@
-#define OUF_TCHAR 1

-

 #define db_free(A) DBFreeVariant(A)

 

 #define db_get_b(A,B,C,D)  DBGetContactSettingByte(A,B,C,D)

diff --git a/plugins/PluginUpdater/src/Events.cpp b/plugins/PluginUpdater/src/Events.cpp
index 3fa58c9439..e05aba0ff2 100644
--- a/plugins/PluginUpdater/src/Events.cpp
+++ b/plugins/PluginUpdater/src/Events.cpp
@@ -91,6 +91,9 @@ int OnPreShutdown(WPARAM, LPARAM)
 	CloseHandle(Timer);

 

 	UninitCheck();

-	UninitListNew();

+

+	#if MIRANDA_VER >= 0x0A00

+		UninitListNew();

+	#endif

 	return 0;

 }

diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index e628d5540d..1c1f4c2ca5 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -748,8 +748,8 @@ int SafeCreateFilePath(TCHAR *pFolder)
 

 char *StrToLower(char *str)

 {

-	for (int i = 0; str[i]; i++) {

+	for (int i = 0; str[i]; i++)

 		str[i] = tolower(str[i]);

-	}

+

 	return str;

-}
\ No newline at end of file
+}