From 87fff9deac0941da4e87728f14c917700d5bbdec Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Aug 2015 17:07:10 +0000 Subject: name conflicts git-svn-id: http://svn.miranda-ng.org/main/trunk@15046 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Utils/mir_smileys.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/Utils') diff --git a/plugins/Utils/mir_smileys.cpp b/plugins/Utils/mir_smileys.cpp index 1c27bd67fc..6ecd7ce27b 100644 --- a/plugins/Utils/mir_smileys.cpp +++ b/plugins/Utils/mir_smileys.cpp @@ -236,10 +236,10 @@ SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SortedList *plText, UINT uText TextPiece *piece = (TextPiece *)plText->items[i]; if (piece->type == TEXT_PIECE_TYPE_TEXT) { - RECT text_rc = { 0, 0, 0x7FFFFFFF, 0x7FFFFFFF }; + RECT rc = { 0, 0, 0x7FFFFFFF, 0x7FFFFFFF }; - DrawText(hdcMem, &szText[piece->start_pos], piece->len, &text_rc, DT_CALCRECT | uTextFormat); - text_size.cx = text_size.cx + text_rc.right - text_rc.left; + DrawText(hdcMem, &szText[piece->start_pos], piece->len, &rc, DT_CALCRECT | uTextFormat); + text_size.cx = text_size.cx + rc.right - rc.left; } else { double factor; -- cgit v1.2.3