From 769b537b5e1a99fc53aa7296fd2b21dc77a4071c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 16 Aug 2015 20:33:13 +0000
Subject: name conflicts solved

git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/StatusPlugins/KeepStatus/keepstatus.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/StatusPlugins/KeepStatus/keepstatus.cpp')

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index 97d0b6f634..36e379aa59 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -98,8 +98,8 @@ TConnectionSettings::TConnectionSettings(PROTOACCOUNT *pa)
 	tszAccName = pa->tszAccountName;
 	szMsg = NULL;
 
-	int status = CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0);
-	AssignStatus(this, status, status, NULL);
+	int iStatus = CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0);
+	AssignStatus(this, iStatus, iStatus, NULL);
 }
 
 TConnectionSettings::~TConnectionSettings()
-- 
cgit v1.2.3