From 721aea0764451e985d575236205808bbef298244 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Thu, 14 Jun 2012 11:13:37 +0000
Subject: one more "#ifsef Unicode" removal

git-svn-id: http://svn.miranda-ng.org/main/trunk@409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Chat/tools.c | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'plugins/Chat/tools.c')

diff --git a/plugins/Chat/tools.c b/plugins/Chat/tools.c
index 41ac446273..6609a388a0 100644
--- a/plugins/Chat/tools.c
+++ b/plugins/Chat/tools.c
@@ -786,7 +786,6 @@ BOOL DoEventHookAsync(HWND hwnd, const TCHAR* pszID, const char* pszModule, int
 
 	gcd->pszModule = mir_strdup( pszModule );
 
-#if defined( _UNICODE )
 	{
 		SESSION_INFO* si;
 		if (( si = SM_FindSession(pszID, pszModule)) == NULL )
@@ -803,11 +802,6 @@ BOOL DoEventHookAsync(HWND hwnd, const TCHAR* pszID, const char* pszModule, int
 			gch->ptszText = mir_tstrdup( pszText );
 		}
 	}
-#else
-	gcd->pszID = mir_strdup( pszID );
-	gch->pszUID = mir_strdup( pszUID );
-	gch->pszText = mir_strdup( pszText );
-#endif
 
 	gcd->iType = iType;
 	gch->dwData = dwItem;
@@ -823,7 +817,6 @@ BOOL DoEventHook(const TCHAR* pszID, const char* pszModule, int iType, const TCH
 
 	gcd.pszModule = (char*)pszModule;
 
-#ifdef _UNICODE
 	{
 		SESSION_INFO* si;
 		if (( si = SM_FindSession(pszID, pszModule)) == NULL )
@@ -840,11 +833,6 @@ BOOL DoEventHook(const TCHAR* pszID, const char* pszModule, int iType, const TCH
 			gch.ptszText = mir_tstrdup( pszText );
 		}
 	}
-#else
-	gcd.pszID = mir_strdup( pszID );
-	gch.pszUID = mir_strdup( pszUID );
-	gch.pszText = mir_strdup( pszText );
-#endif
 
 	gcd.iType = iType;
 	gch.dwData = dwItem;
@@ -909,14 +897,10 @@ TCHAR* a2tf( const TCHAR* str, int flags )
 	if ( str == NULL )
 		return NULL;
 
-	#if defined( _UNICODE )
-		if ( flags & GC_UNICODE )
-			return mir_tstrdup( str );
-		else
-			return mir_a2u((char*)str);
-	#else
-		return mir_strdup( str );
-	#endif
+	if ( flags & GC_UNICODE )
+		return mir_tstrdup( str );
+	else
+		return mir_a2u((char*)str);
 }
 
 TCHAR* replaceStr( TCHAR** dest, const TCHAR* src )
-- 
cgit v1.2.3