diff options
| -rw-r--r-- | plugins/Db_autobackups/headers.h | 11 | ||||
| -rw-r--r-- | plugins/MenuItemEx/version.h | 2 | ||||
| -rw-r--r-- | protocols/JabberG/jabber_proto.cpp | 6 | ||||
| -rw-r--r-- | src/core/miranda.cpp | 2 | ||||
| -rw-r--r-- | src/modules/updatenotify/updatenotify.cpp | 10 |
5 files changed, 13 insertions, 18 deletions
diff --git a/plugins/Db_autobackups/headers.h b/plugins/Db_autobackups/headers.h index f90360c533..b0c235855a 100644 --- a/plugins/Db_autobackups/headers.h +++ b/plugins/Db_autobackups/headers.h @@ -28,13 +28,10 @@ #define MS_AB_BACKUPTRGR "AB/Backuptrg"
#define MS_AB_SAVEAS "AB/SaveAs"
-#ifdef _UNICODE
- #define SUB_DIR L"\\AutoBackups"
- #define DIR L"%miranda_userdata%"
-#else
- #define SUB_DIR "\\AutoBackups"
- #define DIR "%miranda_userdata%"
-#endif
+
+#define SUB_DIR L"\\AutoBackups"
+#define DIR L"%miranda_userdata%"
+
void ShowPopup(TCHAR* text, TCHAR* header);
INT_PTR DBSaveAs(WPARAM wParam, LPARAM lParam);
diff --git a/plugins/MenuItemEx/version.h b/plugins/MenuItemEx/version.h index 59d1c2358c..355dfa6bf4 100644 --- a/plugins/MenuItemEx/version.h +++ b/plugins/MenuItemEx/version.h @@ -6,7 +6,7 @@ #define __PLUGIN_NAME "MenuItemEx (x64) plugin for Miranda IM"
#define __PLUGIN_ID 4304
#define __PLUGIN_ID_STR "4304"
-#elif (_UNICODE)
+#else (_UNICODE)
#define __PLUGIN_NAME "MenuItemEx (Unicode) plugin for Miranda IM"
#define __PLUGIN_ID 4036
#define __PLUGIN_ID_STR "4036"
diff --git a/protocols/JabberG/jabber_proto.cpp b/protocols/JabberG/jabber_proto.cpp index 7d9ef3f14a..350c9d28a8 100644 --- a/protocols/JabberG/jabber_proto.cpp +++ b/protocols/JabberG/jabber_proto.cpp @@ -1212,11 +1212,9 @@ int __cdecl CJabberProto::SendMsg( HANDLE hContact, int flags, const char* pszSr else isEncrypted = 0;
if ( flags & PREF_UTF ) {
- #if defined( _UNICODE )
+
mir_utf8decode( NEWSTR_ALLOCA( pszSrc ), &msg );
- #else
- msg = mir_strdup( mir_utf8decode( NEWSTR_ALLOCA( pszSrc ), 0 ));
- #endif
+
}
else if ( flags & PREF_UNICODE )
msg = mir_u2t(( wchar_t* )&pszSrc[ strlen( pszSrc )+1 ] );
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));
}
|