diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 14:33:30 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 14:33:30 +0000 |
| commit | 05c989e58aeffcfb59cebaca6797cb69dd25cb1e (patch) | |
| tree | 460bde28df51ea7b01109b56818b5880ac47ba66 /plugins/UserInfoEx/init.cpp | |
| parent | ac7bf920f219a7aed7eb163c8b3195e66c12e4da (diff) | |
another portion of "#ifdef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@446 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/init.cpp')
| -rw-r--r-- | plugins/UserInfoEx/init.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/plugins/UserInfoEx/init.cpp b/plugins/UserInfoEx/init.cpp index 886f3edb6c..0054755e33 100644 --- a/plugins/UserInfoEx/init.cpp +++ b/plugins/UserInfoEx/init.cpp @@ -183,15 +183,13 @@ static INT OnModulesLoaded(WPARAM wParam, LPARAM lParam) update.cpbBetaVersionPrefix = (INT)strlen((LPSTR)update.pbBetaVersionPrefix);
#ifdef _WIN64
- #ifdef _UNICODE
+
update.szBetaUpdateURL = "http://userinfoex.googlecode.com/files/uinfoex64.zip";
- #endif
+
#else
- #ifdef _UNICODE
+
update.szBetaUpdateURL = "http://userinfoex.googlecode.com/files/uinfoexW.zip";
- #else
- update.szBetaUpdateURL = "http://userinfoex.googlecode.com/files/uinfoex.zip";
- #endif
+
#endif
// url for displaying changelog for beta versions
@@ -240,12 +238,10 @@ static BOOL CoreCheck() strlwr(szVer);
_tcslwr(tszExePath);
-#ifdef _UNICODE
+
bOk *= (GetVersion() & 0x80000000) == 0;
bOk *= strstr(szVer, "unicode") != 0;
-#else
- bOk *= strstr(szVer, "unicode") == 0;
-#endif
+
bOk *= _tcsstr(_tcsrchr(tszExePath, '\\'), _T("miranda")) != 0;
bOk *= !strstr(szVer, "coffee") && strncmp(szVer, "1.", 2) && !strstr(szVer, " 1.");
|