From 5975b2d0903bd5df128d55e20cd27d7c13b4e46c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy 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_options.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'plugins/Utils/mir_options.cpp') 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