summaryrefslogtreecommitdiff
path: root/plugins/Utils/mir_options.cpp
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-16 17:42:08 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-16 17:42:08 +0000
commit5975b2d0903bd5df128d55e20cd27d7c13b4e46c (patch)
tree6696492511c591fa8bf3b65a64864245caa3e7c2 /plugins/Utils/mir_options.cpp
parent8617d7e00546f892c9084f7c382648b23d8bbb63 (diff)
another portion of "#ifdef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Utils/mir_options.cpp')
-rw-r--r--plugins/Utils/mir_options.cpp9
1 files changed, 2 insertions, 7 deletions
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)