From 17501083ca15adc9e3f53757b47a961ed2e77e9c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 27 Aug 2015 21:42:44 +0000
Subject: warning fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@15051 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SmileyAdd/SmileyAdd.vcxproj | 6 +++++-
 plugins/SmileyAdd/src/general.cpp   | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'plugins/SmileyAdd')

diff --git a/plugins/SmileyAdd/SmileyAdd.vcxproj b/plugins/SmileyAdd/SmileyAdd.vcxproj
index a89d90ad10..eafa17dde1 100644
--- a/plugins/SmileyAdd/SmileyAdd.vcxproj
+++ b/plugins/SmileyAdd/SmileyAdd.vcxproj
@@ -25,9 +25,13 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
   </ImportGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <DisableSpecificWarnings>4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\regexp\*.cpp">
-      <DisableSpecificWarnings>4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>
     </ClCompile>
   </ItemGroup>
diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp
index 1416db2f6b..7b0dff73fd 100644
--- a/plugins/SmileyAdd/src/general.cpp
+++ b/plugins/SmileyAdd/src/general.cpp
@@ -217,18 +217,18 @@ MCONTACT DecodeMetaContact(MCONTACT hContact)
 		return NULL;
 	
 	MCONTACT hReal = db_mc_getMostOnline(hContact);
-	if (hReal == NULL || hReal == (MCONTACT)CALLSERVICE_NOTFOUND)
+	if (hReal == NULL || (INT_PTR)hReal == CALLSERVICE_NOTFOUND)
 		hReal = hContact;
 
 	return hReal;
 }
 
-bool IsSmileyProto(char* proto)
+bool IsSmileyProto(char *proto)
 {
 	return proto && mir_strcmp(proto, META_PROTO) && (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & (PF1_IM | PF1_CHAT));
 }
 
-void ReportError(const TCHAR* errmsg)
+void ReportError(const TCHAR *errmsg)
 {
 	static const TCHAR title[] = _T("Miranda SmileyAdd");
 
-- 
cgit v1.2.3