From 58973a21a30bf95427fd43c456e41e35c386218c Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Fri, 15 Jun 2012 18:52:16 +0000
Subject: another portion of "#ifsef Unicode" removal

git-svn-id: http://svn.miranda-ng.org/main/trunk@434 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/FavContacts/src/contact_cache.cpp | 3 +--
 plugins/FavContacts/src/headers.h         | 4 ----
 plugins/FavContacts/src/http_api.cpp      | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'plugins/FavContacts')

diff --git a/plugins/FavContacts/src/contact_cache.cpp b/plugins/FavContacts/src/contact_cache.cpp
index c61635cc26..9464c22a77 100644
--- a/plugins/FavContacts/src/contact_cache.cpp
+++ b/plugins/FavContacts/src/contact_cache.cpp
@@ -135,9 +135,8 @@ static bool AppendInfo(TCHAR *buf, int size, HANDLE hContact, int info)
 	ci.cbSize = sizeof(ci);
 	ci.hContact = hContact;
 	ci.dwFlag = info;
-#if defined(UNICODE) || defined(_UNICODE)
 	ci.dwFlag |= CNF_UNICODE;
-#endif
+
 
 	bool ret = false;
 
diff --git a/plugins/FavContacts/src/headers.h b/plugins/FavContacts/src/headers.h
index 677decedcb..59d3693926 100644
--- a/plugins/FavContacts/src/headers.h
+++ b/plugins/FavContacts/src/headers.h
@@ -20,10 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define _CRT_SECURE_NO_DEPRECATE
 
-#if defined(UNICODE) && !defined(_UNICODE)
-   #define _UNICODE
-#endif
-
 #include <tchar.h>
 #define _WIN32_WINNT 0x0501
 #include <windows.h>
diff --git a/plugins/FavContacts/src/http_api.cpp b/plugins/FavContacts/src/http_api.cpp
index ac9171f9c5..9b2ac3f3c3 100644
--- a/plugins/FavContacts/src/http_api.cpp
+++ b/plugins/FavContacts/src/http_api.cpp
@@ -97,14 +97,14 @@ public:
 		m_socket->Send(s);
 	}
 
-#ifdef UNICODE
+
 	void Send(WCHAR *ws)
 	{
 		char *s = mir_utf8encodeW(ws);
 		m_socket->Send(s);
 		mir_free(s);
 	}
-#endif
+
 
 	void Send(int i)
 	{
-- 
cgit v1.2.3