From 46eff0941450114f9dda873037d6744263dc9ad0 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Jun 2012 19:20:06 +0000 Subject: small portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@435 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/miranda.cpp | 2 +- src/modules/updatenotify/updatenotify.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp index 5bcf10285f..3a3ce614a3 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.cpp @@ -763,7 +763,7 @@ static INT_PTR GetMirandaVersionText(WPARAM wParam, LPARAM lParam) VerQueryValue(pVerInfo, _T("\\StringFileInfo\\000004b0\\ProductVersion"), (LPVOID*)&productVersion, &blockSize); #if defined( _WIN64 ) mir_snprintf(( char* )lParam, wParam, "%S x64 Unicode", productVersion ); -#elif defined( _UNICODE ) +#else defined( _UNICODE ) mir_snprintf(( char* )lParam, wParam, "%S Unicode", productVersion ); #endif mir_free(pVerInfo); diff --git a/src/modules/updatenotify/updatenotify.cpp b/src/modules/updatenotify/updatenotify.cpp index 5f7b3e67c4..b29753c216 100644 --- a/src/modules/updatenotify/updatenotify.cpp +++ b/src/modules/updatenotify/updatenotify.cpp @@ -234,7 +234,7 @@ static void UpdateNotifyReleaseLogUpdate(UpdateNotifyReleaseData *d) { return; #ifdef _WIN64 Netlib_Logf(hNetlibUser, "Update server version: %s [%s] [64-bit]", d->szVersionPublic, d->szVersion); - #elif defined(_UNICODE) + #else defined(_UNICODE) Netlib_Logf(hNetlibUser, "Update server version: %s [%s] [Unicode]", d->szVersionPublic, d->szVersion); #endif } @@ -288,7 +288,7 @@ static int UpdateNotifyMakeRequest(UpdateNotifyData *und) { headers[0].szValue = szUserAgent; #ifdef _WIN64 mir_snprintf(szUserAgent, sizeof(szUserAgent), "Miranda/%s (x64)", szVersion); - #elif defined(_UNICODE) + #else defined(_UNICODE) mir_snprintf(szUserAgent, sizeof(szUserAgent), "Miranda/%s (Unicode)", szVersion); #endif req.headersCount = 1; @@ -321,7 +321,7 @@ static int UpdateNotifyMakeRequest(UpdateNotifyData *und) { if ((n = xun.getChildByPath(nodeDoc, _T("releases/releasestable/downloadx64exe"), 0)) != NULL && xun.getText(n)) { rdStable.szDownload = mir_t2a(xun.getText(n)); } - #elif defined(_UNICODE) + #else defined(_UNICODE) if ((n = xun.getChildByPath(nodeDoc, _T("releases/releasestable/downloadunicodeexe"), 0)) != NULL && xun.getText(n)) { rdStable.szDownload = mir_t2a(xun.getText(n)); } @@ -346,7 +346,7 @@ static int UpdateNotifyMakeRequest(UpdateNotifyData *und) { if ((n = xun.getChildByPath(nodeDoc, _T("releases/releasebeta/downloadx64zip"), 0)) != NULL && xun.getText(n)) { rdBeta.szDownload = mir_t2a(xun.getText(n)); } - #elif defined(_UNICODE) + #else defined(_UNICODE) if ((n = xun.getChildByPath(nodeDoc, _T("releases/releasebeta/downloadunicodeexe"), 0)) != NULL && xun.getText(n)) { rdBeta.szDownload = mir_t2a(xun.getText(n)); } @@ -371,7 +371,7 @@ static int UpdateNotifyMakeRequest(UpdateNotifyData *und) { if ((n = xun.getChildByPath(nodeDoc, _T("releases/releasealpha/downloadx64zip"), 0)) != NULL && xun.getText(n)) { rdAlpha.szDownload = mir_t2a(xun.getText(n)); } - #elif defined(_UNICODE) + #else defined(_UNICODE) if ((n = xun.getChildByPath(nodeDoc, _T("releases/releasealpha/downloadunicodezip"), 0)) != NULL && xun.getText(n)) { rdAlpha.szDownload = mir_t2a(xun.getText(n)); } -- cgit v1.2.3