summaryrefslogtreecommitdiff
path: root/src/modules/database/profilemanager.cpp
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-15 14:13:45 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-15 14:13:45 +0000
commit4aa6229698b946e52ce19018aaf13f8b92fb168e (patch)
tree29334e8c5ee492a80f11a97fedab2373b8fbb392 /src/modules/database/profilemanager.cpp
parent5e8e561a80d1ac9ca1c2f1c3d388105733ed4e4e (diff)
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/database/profilemanager.cpp')
-rw-r--r--src/modules/database/profilemanager.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp
index 3ee38c754c..7d362fd554 100644
--- a/src/modules/database/profilemanager.cpp
+++ b/src/modules/database/profilemanager.cpp
@@ -226,24 +226,16 @@ static int DetectDbProvider(const char*, DATABASELINK * dblink, LPARAM lParam)
{
int error;
-#ifdef _UNICODE
- char* fullpath = makeFileName(( TCHAR* )lParam );
-#else
- char* fullpath = (char*)lParam;
-#endif
+char* fullpath = makeFileName(( TCHAR* )lParam );
int ret = dblink->grokHeader(fullpath, &error);
-#ifdef _UNICODE
mir_free( fullpath );
-#endif
if ( ret == 0) {
-#ifdef _UNICODE
+
char tmp[ MAX_PATH ];
dblink->getFriendlyName(tmp, SIZEOF(tmp), 1);
MultiByteToWideChar(CP_ACP, 0, tmp, -1, (TCHAR*)lParam, MAX_PATH);
-#else
- dblink->getFriendlyName((TCHAR*)lParam, MAX_PATH, 1);
-#endif
+
return DBPE_HALT;
}