From 5975b2d0903bd5df128d55e20cd27d7c13b4e46c Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Sat, 16 Jun 2012 17:42:08 +0000
Subject: another portion of "#ifdef Unicode" removal

git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Utils/mir_memory.h    | 22 ----------------------
 plugins/Utils/mir_options.cpp |  9 ++-------
 2 files changed, 2 insertions(+), 29 deletions(-)

(limited to 'plugins/Utils')

diff --git a/plugins/Utils/mir_memory.h b/plugins/Utils/mir_memory.h
index b7ed17b6aa..51b16866ab 100644
--- a/plugins/Utils/mir_memory.h
+++ b/plugins/Utils/mir_memory.h
@@ -73,7 +73,6 @@ static int strcmpnullW(WCHAR *str1, WCHAR *str2)
 }
 
 
-#ifdef UNICODE
 
 #define CHECK_VERSION(_NAME_)																\
 	if (!mir_is_unicode())																	\
@@ -94,27 +93,6 @@ static int strcmpnullW(WCHAR *str1, WCHAR *str2)
 	char _new_var_[_size_];																	\
 	WideCharToMultiByte(CP_ACP, 0, _old_var_, -1, _new_var_, _size_, NULL, NULL);
 
-#else
-
-#define CHECK_VERSION(_NAME_)																\
-	if (mir_is_unicode())																	\
-	{																						\
-		MessageBox(NULL, _T("Your Miranda is unicode. You have to install unicode ") _T(_NAME_),	\
-						_T(_NAME_), MB_OK | MB_ICONERROR);									\
-		return -1;																			\
-	}
-
-# define lstrcmpnull strcmpnull
-
-#define INPLACE_CHAR_TO_TCHAR(_new_var_, _size_, _old_var_)									\
-	TCHAR *_new_var_ = _old_var_
-
-#define INPLACE_TCHAR_TO_CHAR(_new_var_, _size_, _old_var_)									\
-	char *_new_var_ = _old_var_;
-
-#endif
-
-
 
 // Free memory and set to NULL
 //#define MIR_FREE(_x_) if (_x_ != NULL) { mir_free(_x_); _x_ = NULL; }
diff --git a/plugins/Utils/mir_options.cpp b/plugins/Utils/mir_options.cpp
index 85782488da..2fa58dffbf 100644
--- a/plugins/Utils/mir_options.cpp
+++ b/plugins/Utils/mir_options.cpp
@@ -48,7 +48,7 @@ static TCHAR* MyDBGetContactSettingTString(HANDLE hContact, char* module, char*
 
 	if (!DBGetContactSettingTString(hContact, module, setting, &dbv))
 	{
-#ifdef UNICODE
+
 		if (dbv.type == DBVT_ASCIIZ)
 		{
 			MultiByteToWideChar(CP_ACP, 0, dbv.pszVal, -1, out, (int)len);
@@ -61,12 +61,7 @@ static TCHAR* MyDBGetContactSettingTString(HANDLE hContact, char* module, char*
 		{
 			lstrcpyn(out, dbv.pwszVal, (int)len);
 		}
-#else
-		if (dbv.type == DBVT_ASCIIZ)
-		{
-			lstrcpyn(out, dbv.pszVal, len);
-		}
-#endif
+
 		else
 		{
 			if (def != NULL)
-- 
cgit v1.2.3