diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 17:42:08 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 17:42:08 +0000 |
| commit | 5975b2d0903bd5df128d55e20cd27d7c13b4e46c (patch) | |
| tree | 6696492511c591fa8bf3b65a64864245caa3e7c2 /plugins/AssocMgr/utils.cpp | |
| parent | 8617d7e00546f892c9084f7c382648b23d8bbb63 (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/AssocMgr/utils.cpp')
| -rw-r--r-- | plugins/AssocMgr/utils.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/plugins/AssocMgr/utils.cpp b/plugins/AssocMgr/utils.cpp index 663484142a..e6414eeb02 100644 --- a/plugins/AssocMgr/utils.cpp +++ b/plugins/AssocMgr/utils.cpp @@ -76,25 +76,19 @@ char* u2a(const WCHAR *pszUnicode,BOOL fMirCp) // mir_free() the return value
TCHAR* s2t(const void *pszStr,DWORD fUnicode,BOOL fMirCp)
{
-#if defined(_UNICODE)
+
if(fUnicode) return mir_wstrdup((WCHAR*)pszStr);
return a2u((char*)pszStr,fMirCp);
-#else
- if(fUnicode) return u2a((WCHAR*)pszStr,fMirCp);
- return mir_strdup((char*)pszStr);
-#endif
+
}
// mir_free() the return value
void* t2s(const TCHAR *pszStr,DWORD fUnicode,BOOL fMirCp)
{
-#if defined(_UNICODE)
+
if (!fUnicode) return (void*)u2a(pszStr,fMirCp);
return (void*)mir_wstrdup(pszStr);
-#else
- if(fUnicode) return (void*)a2u(pszStr,fMirCp);
- return (void*)mir_strdup(pszStr);
-#endif
+
}
/************************* Database *******************************/
|