From 25b8dcd3e31a9b09ce6180d34273d68242791d79 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Mon, 16 Sep 2013 13:47:55 +0000 Subject: removed not needed _MSC_VER checks git-svn-id: http://svn.miranda-ng.org/main/trunk@6085 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/conv.cpp | 8 ++------ protocols/AimOscar/src/utility.cpp | 6 ------ protocols/GTalkExt/src/stdafx.h | 5 ----- protocols/Gadu-Gadu/src/gg.h | 10 ---------- protocols/IcqOscarJ/src/icqoscar.h | 4 +--- protocols/JabberG/src/jabber.h | 4 +--- protocols/MRA/src/Mra.h | 2 -- protocols/MRA/src/MraAvatars.h | 2 -- protocols/MRA/src/MraChat.h | 2 -- protocols/MRA/src/MraConstans.h | 2 -- protocols/MRA/src/MraIcons.h | 3 --- protocols/MRA/src/MraMPop.h | 2 -- protocols/MRA/src/MraMRIMProxy.h | 2 -- protocols/MRA/src/MraOfflineMsg.h | 11 ----------- protocols/MRA/src/MraPlaces.h | 3 --- protocols/MRA/src/MraPopUp.h | 4 ---- protocols/MRA/src/MraProto.h | 2 -- protocols/MRA/src/MraRTFMsg.h | 2 -- protocols/MRA/src/MraSelectEMail.h | 4 ---- protocols/MRA/src/MraSendCommand.h | 3 --- protocols/MRA/src/MraSendQueue.h | 7 ------- protocols/MRA/src/Sdk/BuffToLowerCase.h | 3 --- protocols/MRA/src/Sdk/DebugFunctions.h | 2 -- protocols/MRA/src/Sdk/FIFOMT.h | 3 --- protocols/MRA/src/Sdk/InterlockedFunctions.h | 3 --- protocols/MRA/src/Sdk/InternetTime.h | 3 --- protocols/MRA/src/Sdk/ListMT.h | 20 -------------------- protocols/MRA/src/Sdk/MemoryFind.h | 4 ---- protocols/MRA/src/Sdk/MemoryFindByte.h | 4 ---- protocols/MRA/src/Sdk/RC4.h | 4 ---- protocols/MRA/src/Sdk/SHA1.h | 2 -- protocols/MRA/src/Sdk/StrHexToNum.h | 5 ----- protocols/MRA/src/Sdk/StrToNum.h | 4 ---- protocols/MRA/src/Sdk/timefuncs.h | 4 ---- protocols/Twitter/src/proto.cpp | 4 ++-- protocols/Xfire/src/SHA1.cpp | 4 ---- protocols/Xfire/src/SHA1.h | 15 --------------- protocols/Yahoo/src/proto.cpp | 4 +--- 38 files changed, 7 insertions(+), 169 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/conv.cpp b/protocols/AimOscar/src/conv.cpp index f16a90cd84..04f87d068a 100644 --- a/protocols/AimOscar/src/conv.cpp +++ b/protocols/AimOscar/src/conv.cpp @@ -18,9 +18,7 @@ along with this program. If not, see . */ #include "aim.h" -#ifdef _MSC_VER - #pragma warning( disable: 4706 ) -#endif +#pragma warning( disable: 4706 ) char* process_status_msg (const char *str, const char* sn) { @@ -901,6 +899,4 @@ aimString::aimString(char* str) } } -#ifdef _MSC_VER - #pragma warning( default: 4706 ) -#endif +#pragma warning( default: 4706 ) diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp index 1ae59c437f..a113ee191d 100644 --- a/protocols/AimOscar/src/utility.cpp +++ b/protocols/AimOscar/src/utility.cpp @@ -558,13 +558,7 @@ int CAimProto::open_contact_file(const char* sn, const TCHAR* file, const char* if (fid < 0) { TCHAR errmsg[512]; - #if _MSC_VER > 1200 mir_sntprintf(errmsg, SIZEOF(errmsg), TranslateT("Failed to open file: %s %s"), path, __tcserror(NULL)); - #else - TCHAR* err = mir_a2t(_strerror(NULL)); - mir_sntprintf(errmsg, SIZEOF(errmsg), TranslateT("Failed to open file: %s %s"), path, err); - mir_free(err); - #endif ShowPopup((char*)errmsg, ERROR_POPUP | TCHAR_POPUP); } return fid; diff --git a/protocols/GTalkExt/src/stdafx.h b/protocols/GTalkExt/src/stdafx.h index d89c4d59e7..76fcb5ee0d 100644 --- a/protocols/GTalkExt/src/stdafx.h +++ b/protocols/GTalkExt/src/stdafx.h @@ -64,9 +64,4 @@ #include #pragma warning(pop) -#if _MSC_VER < 1400 - #define _tstoi64 _ttoi - #define _tcstoui64(A,B,C) _ttoi(A) -#endif - extern HINSTANCE g_hInst; diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h index 0fb853d5d5..8c77df9033 100644 --- a/protocols/Gadu-Gadu/src/gg.h +++ b/protocols/Gadu-Gadu/src/gg.h @@ -37,11 +37,7 @@ // Windows headers // Visual C++ .NET tries to include winsock.h // which is very ver bad -#if (_MSC_VER >= 1300) #include -#else -#include -#endif #include #include @@ -85,11 +81,7 @@ #include "m_folders.h" // Visual C++ extras -#ifdef _MSC_VER #define GGINLINE -#else -#define GGINLINE inline -#endif // Plugin headers #include "resource.h" @@ -300,14 +292,12 @@ struct GGGETAVATARDATA #define GG_POPUP_MULTILOGON 16 // Some MSVC compatibility with gcc -#ifdef _MSC_VER #ifndef strcasecmp #define strcasecmp _strcmpi #endif #ifndef strncasecmp #define strncasecmp _strnicmp #endif -#endif // Global variables ///////////////////////////////////////////////// diff --git a/protocols/IcqOscarJ/src/icqoscar.h b/protocols/IcqOscarJ/src/icqoscar.h index a28f63aac0..a6cbcb6714 100644 --- a/protocols/IcqOscarJ/src/icqoscar.h +++ b/protocols/IcqOscarJ/src/icqoscar.h @@ -49,9 +49,7 @@ #include #ifndef _DEBUG -#ifdef _MSC_VER - #include -#endif +#include #endif #ifndef AW_VER_POSITIVE diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h index 20371a9e30..740002ed40 100644 --- a/protocols/JabberG/src/jabber.h +++ b/protocols/JabberG/src/jabber.h @@ -25,9 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _JABBER_H_ #define _JABBER_H_ -#ifdef _MSC_VER - #pragma warning(disable:4706 4121 4127) -#endif +#pragma warning(disable:4706 4121 4127) #define LISTFOREACH(var__, obj__, list__) \ for (int var__ = 0; (var__ = obj__->ListFindNext(list__, var__)) >= 0; ++var__) diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h index 59f10ec036..8473a0711c 100644 --- a/protocols/MRA/src/Mra.h +++ b/protocols/MRA/src/Mra.h @@ -2,9 +2,7 @@ #define AFX_MRA_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 #define _CRT_SECURE_NO_WARNINGS diff --git a/protocols/MRA/src/MraAvatars.h b/protocols/MRA/src/MraAvatars.h index 683fb525e0..0756a4efb5 100644 --- a/protocols/MRA/src/MraAvatars.h +++ b/protocols/MRA/src/MraAvatars.h @@ -2,9 +2,7 @@ #define AFX_MRA_AVATARS_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 #define PA_FORMAT_DEFAULT 255 // return file name of def avatar #define GetContactAvatarFormat(hContact, dwDefaultFormat) getByte(hContact, "AvatarType", dwDefaultFormat) diff --git a/protocols/MRA/src/MraChat.h b/protocols/MRA/src/MraChat.h index 790c16584a..d8fa23f734 100644 --- a/protocols/MRA/src/MraChat.h +++ b/protocols/MRA/src/MraChat.h @@ -2,8 +2,6 @@ #define AFX_MRA_CHAT_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 #endif // !defined(AFX_MRA_CHAT_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_) diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h index 562e847c37..de3cb26606 100644 --- a/protocols/MRA/src/MraConstans.h +++ b/protocols/MRA/src/MraConstans.h @@ -3,9 +3,7 @@ #include "proto.h" -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 #define PROTOCOL_DISPLAY_NAME_ORIGA "Mail.ru Agent" diff --git a/protocols/MRA/src/MraIcons.h b/protocols/MRA/src/MraIcons.h index 992914805b..527f3d403f 100644 --- a/protocols/MRA/src/MraIcons.h +++ b/protocols/MRA/src/MraIcons.h @@ -2,10 +2,7 @@ #define AFX_MRA_ICONS_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - HICON IconLibGetIcon(HANDLE hIcon); HICON IconLibGetIconEx(HANDLE hIcon, DWORD dwFlags); diff --git a/protocols/MRA/src/MraMPop.h b/protocols/MRA/src/MraMPop.h index 3d012235a0..ee0ede280f 100644 --- a/protocols/MRA/src/MraMPop.h +++ b/protocols/MRA/src/MraMPop.h @@ -2,9 +2,7 @@ #define AFX_MRA_MPOP_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 DWORD MraMPopSessionQueueInitialize (HANDLE *phMPopSessionQueue); void MraMPopSessionQueueDestroy (HANDLE hMPopSessionQueue); diff --git a/protocols/MRA/src/MraMRIMProxy.h b/protocols/MRA/src/MraMRIMProxy.h index 5aac9c5fbd..5b8b2ad75a 100644 --- a/protocols/MRA/src/MraMRIMProxy.h +++ b/protocols/MRA/src/MraMRIMProxy.h @@ -2,9 +2,7 @@ #define AFX_MRA_MRIMPROXY_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 DWORD MraMrimProxySetData(HANDLE hMraMrimProxyData, const CMStringA &szEmail, DWORD dwIDRequest, DWORD dwDataType, const CMStringA &lpszUserData, const CMStringA &szAddresses, MRA_GUID *pmguidSessionID); diff --git a/protocols/MRA/src/MraOfflineMsg.h b/protocols/MRA/src/MraOfflineMsg.h index e2e7a0f50f..59104f08e4 100644 --- a/protocols/MRA/src/MraOfflineMsg.h +++ b/protocols/MRA/src/MraOfflineMsg.h @@ -1,19 +1,8 @@ #if !defined(AFX_MRA_OFFLINEMSG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_) #define AFX_MRA_OFFLINEMSG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ - -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - - - - DWORD MraOfflineMessageGet(CMStringA *plpsMsg, DWORD *pdwTime, DWORD *pdwFlags, CMStringA *plpsEMail, CMStringA *plpsText, CMStringA *plpsRTFText, CMStringA *plpsMultiChatData); - - - - #endif // !defined(AFX_MRA_OFFLINEMSG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_) diff --git a/protocols/MRA/src/MraPlaces.h b/protocols/MRA/src/MraPlaces.h index a81a43ca64..cbcd3d1567 100644 --- a/protocols/MRA/src/MraPlaces.h +++ b/protocols/MRA/src/MraPlaces.h @@ -2,10 +2,7 @@ #define AFX_MRA_PLACES_H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - #define lpwszOther TEXT("Другое") //static LPWSTR lpwszOther = TEXT("Другое"); diff --git a/protocols/MRA/src/MraPopUp.h b/protocols/MRA/src/MraPopUp.h index ee77da0f28..ead13be0bc 100644 --- a/protocols/MRA/src/MraPopUp.h +++ b/protocols/MRA/src/MraPopUp.h @@ -2,11 +2,7 @@ #define AFX_MRA_POPUP_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - - #define MRA_POPUP_ALLOW_MSGBOX 1 #define MRA_POPUP_ALLOW_ENTER 2 diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h index a152547caf..990ea86a46 100644 --- a/protocols/MRA/src/MraProto.h +++ b/protocols/MRA/src/MraProto.h @@ -1,6 +1,4 @@ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 #define SCBIFSI_LOCK_CHANGES_EVENTS 1 #define SCBIF_ID 1 diff --git a/protocols/MRA/src/MraRTFMsg.h b/protocols/MRA/src/MraRTFMsg.h index 85d88697bc..b0abacf5e5 100644 --- a/protocols/MRA/src/MraRTFMsg.h +++ b/protocols/MRA/src/MraRTFMsg.h @@ -2,9 +2,7 @@ #define AFX_MRA_RTFMSG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 bool MraIsMessageFlashAnimation(const CMStringW &lpwszMessage); diff --git a/protocols/MRA/src/MraSelectEMail.h b/protocols/MRA/src/MraSelectEMail.h index c031ee72ab..e0ba9e078c 100644 --- a/protocols/MRA/src/MraSelectEMail.h +++ b/protocols/MRA/src/MraSelectEMail.h @@ -2,11 +2,7 @@ #define AFX_MRA_SELECT_EMAIL_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - - #define MRA_SELECT_EMAIL_TYPE_SEND_POSTCARD 1 #define MRA_SELECT_EMAIL_TYPE_VIEW_ALBUM 2 diff --git a/protocols/MRA/src/MraSendCommand.h b/protocols/MRA/src/MraSendCommand.h index dd1eb9a2b0..6ee18ecf34 100644 --- a/protocols/MRA/src/MraSendCommand.h +++ b/protocols/MRA/src/MraSendCommand.h @@ -2,9 +2,6 @@ #define AFX_MRA_SENDCOMMAND_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - #endif // !defined(AFX_MRA_SENDCOMMAND_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_) diff --git a/protocols/MRA/src/MraSendQueue.h b/protocols/MRA/src/MraSendQueue.h index 0e7f7ae51a..1115c4f815 100644 --- a/protocols/MRA/src/MraSendQueue.h +++ b/protocols/MRA/src/MraSendQueue.h @@ -2,11 +2,7 @@ #define AFX_MRA_SENDQUEUE_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - - DWORD MraSendQueueInitialize(DWORD dwSendTimeOutInterval, HANDLE *phSendQueueHandle); void MraSendQueueDestroy(HANDLE hSendQueueHandle); @@ -17,7 +13,4 @@ DWORD MraSendQueueFree(HANDLE hSendQueueHandle, DWORD dwCMDNum); DWORD MraSendQueueFind(HANDLE hSendQueueHandle, DWORD dwCMDNum, DWORD *pdwFlags, HANDLE *phContact, DWORD *pdwAckType, LPBYTE *plpbData, size_t *pdwDataSize); DWORD MraSendQueueFindOlderThan(HANDLE hSendQueueHandle, DWORD dwTime, DWORD *pdwCMDNum, DWORD *pdwFlags, HANDLE *phContact, DWORD *pdwAckType, LPBYTE *plpbData, size_t *pdwDataSize); - - - #endif // !defined(AFX_MRA_SENDQUEUE_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_) diff --git a/protocols/MRA/src/Sdk/BuffToLowerCase.h b/protocols/MRA/src/Sdk/BuffToLowerCase.h index cc701d7d98..c32352e82c 100644 --- a/protocols/MRA/src/Sdk/BuffToLowerCase.h +++ b/protocols/MRA/src/Sdk/BuffToLowerCase.h @@ -29,10 +29,7 @@ #if !defined(AFX_BUFFTOLOWERCASE__H__INCLUDED_) #define AFX_BUFFTOLOWERCASE__H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - __inline BOOL BuffToLowerCase(LPCVOID lpcOutBuff,LPCVOID lpcBuff,size_t dwLen) diff --git a/protocols/MRA/src/Sdk/DebugFunctions.h b/protocols/MRA/src/Sdk/DebugFunctions.h index 60cd880210..9ae925d448 100644 --- a/protocols/MRA/src/Sdk/DebugFunctions.h +++ b/protocols/MRA/src/Sdk/DebugFunctions.h @@ -30,9 +30,7 @@ #if !defined(AFX_DEBUG_FUNCTIONS__H__INCLUDED_) #define AFX_DEBUG_FUNCTIONS__H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 ////////////////////////////////////////////////////////////////////////// ////////////////////////////DebugPrint//////////////////////////////////// diff --git a/protocols/MRA/src/Sdk/FIFOMT.h b/protocols/MRA/src/Sdk/FIFOMT.h index 80f9ae3220..3c6c250d87 100644 --- a/protocols/MRA/src/Sdk/FIFOMT.h +++ b/protocols/MRA/src/Sdk/FIFOMT.h @@ -30,10 +30,7 @@ #if !defined(AFX_FIFO_MT__H__INCLUDED_) #define AFX_FIFO_MT__H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - #include "Sdk/ListMT.h" #include "Sdk/InterlockedFunctions.h" diff --git a/protocols/MRA/src/Sdk/InterlockedFunctions.h b/protocols/MRA/src/Sdk/InterlockedFunctions.h index 1ecb7aa16c..49b7332fd8 100644 --- a/protocols/MRA/src/Sdk/InterlockedFunctions.h +++ b/protocols/MRA/src/Sdk/InterlockedFunctions.h @@ -30,10 +30,7 @@ #if !defined(AFX_INTERLOCKED_FUNCTIONS__H__INCLUDED_) #define AFX_INTERLOCKED_FUNCTIONS__H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - #ifndef InterlockedIncrementPointer #if defined(_WIN64) diff --git a/protocols/MRA/src/Sdk/InternetTime.h b/protocols/MRA/src/Sdk/InternetTime.h index 0c7bde1f36..fbb1233e8e 100644 --- a/protocols/MRA/src/Sdk/InternetTime.h +++ b/protocols/MRA/src/Sdk/InternetTime.h @@ -31,10 +31,7 @@ #define AFX_INTERNET_TIME_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - #include "Sdk/StrToNum.h" #include "Sdk/MemoryFind.h" diff --git a/protocols/MRA/src/Sdk/ListMT.h b/protocols/MRA/src/Sdk/ListMT.h index 31235084db..63cd54b9fb 100644 --- a/protocols/MRA/src/Sdk/ListMT.h +++ b/protocols/MRA/src/Sdk/ListMT.h @@ -30,21 +30,12 @@ #if !defined(AFX_LIST_MT__H__INCLUDED_) #define AFX_LIST_MT__H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - #include "Sdk/InterlockedFunctions.h" -#if defined(_MSC_VER) -#if _MSC_VER >= 800 -#if _MSC_VER >= 1200 #pragma warning(push) -#endif #pragma warning(disable:4312) // warning C4312: 'type cast' : conversion from 'LONG' to 'PVOID' of greater size -#endif -#endif // структура для работы со списком, элемент списка @@ -252,18 +243,7 @@ __inline DWORD ListMTIteratorGet(PCLIST_MT_ITERATOR pclmtiIterator,PLIST_MT_ITEM return(dwRetErrorCode); } - - -#if defined(_MSC_VER) -#if _MSC_VER >= 800 -#if _MSC_VER >= 1200 #pragma warning(pop) -#else #pragma warning(default:4312) // warning C4312: 'type cast' : conversion from 'LONG' to 'PVOID' of greater size -#endif -#endif -#endif - - #endif // !defined(AFX_LIST_MT__H__INCLUDED_) diff --git a/protocols/MRA/src/Sdk/MemoryFind.h b/protocols/MRA/src/Sdk/MemoryFind.h index 8395f86249..75072540bd 100644 --- a/protocols/MRA/src/Sdk/MemoryFind.h +++ b/protocols/MRA/src/Sdk/MemoryFind.h @@ -30,11 +30,7 @@ #define AFX_MEMORYFIND__H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - - __inline void *MemoryFind(size_t dwFrom,const void *pBuff,size_t dwBuffSize,const void *pWhatFind,size_t dwWhatFindSize) { diff --git a/protocols/MRA/src/Sdk/MemoryFindByte.h b/protocols/MRA/src/Sdk/MemoryFindByte.h index ed459a684c..27a3b96149 100644 --- a/protocols/MRA/src/Sdk/MemoryFindByte.h +++ b/protocols/MRA/src/Sdk/MemoryFindByte.h @@ -30,11 +30,7 @@ #if !defined(AFX_MEMORYFINDBYTE__H__INCLUDED_) #define AFX_MEMORYFINDBYTE__H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - - __inline void *MemoryFindByte(size_t dwFrom,const void *pBuff,size_t dwBuffSize,unsigned char chWhatFind) { diff --git a/protocols/MRA/src/Sdk/RC4.h b/protocols/MRA/src/Sdk/RC4.h index cb6331a183..4db7202c0a 100644 --- a/protocols/MRA/src/Sdk/RC4.h +++ b/protocols/MRA/src/Sdk/RC4.h @@ -30,11 +30,7 @@ #if !defined(AFX_RC4__H__INCLUDED_) #define AFX_RC4__H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - - __inline void RC4(LPBYTE lpBuff,size_t dwBuffSize,LPBYTE lpKey,size_t dwKeySize) {// RC4 diff --git a/protocols/MRA/src/Sdk/SHA1.h b/protocols/MRA/src/Sdk/SHA1.h index bdac4cad8c..96449340bd 100644 --- a/protocols/MRA/src/Sdk/SHA1.h +++ b/protocols/MRA/src/Sdk/SHA1.h @@ -28,9 +28,7 @@ #if !defined(AFX__SHA1_H__INCLUDED_) #define AFX__SHA1_H__INCLUDED_ -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// diff --git a/protocols/MRA/src/Sdk/StrHexToNum.h b/protocols/MRA/src/Sdk/StrHexToNum.h index 6b99b524c2..78c78cf562 100644 --- a/protocols/MRA/src/Sdk/StrHexToNum.h +++ b/protocols/MRA/src/Sdk/StrHexToNum.h @@ -30,12 +30,7 @@ #if !defined(AFX_STRHEXTONUM__H__INCLUDED_) #define AFX_STRHEXTONUM__H__INCLUDED_ - - -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 - __inline DWORD StrHexToUNum32(LPCSTR lpcszString,size_t dwStringLen) { diff --git a/protocols/MRA/src/Sdk/StrToNum.h b/protocols/MRA/src/Sdk/StrToNum.h index 72f926bd28..3d7d3bb86f 100644 --- a/protocols/MRA/src/Sdk/StrToNum.h +++ b/protocols/MRA/src/Sdk/StrToNum.h @@ -30,11 +30,7 @@ #if !defined(AFX_STRTONUM__H__INCLUDED_) #define AFX_STRTONUM__H__INCLUDED_ - - -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 __inline DWORD StrToUNum32(LPCSTR lpcszString,size_t dwStringLen) { diff --git a/protocols/MRA/src/Sdk/timefuncs.h b/protocols/MRA/src/Sdk/timefuncs.h index 976abd1792..8ac5a80edf 100644 --- a/protocols/MRA/src/Sdk/timefuncs.h +++ b/protocols/MRA/src/Sdk/timefuncs.h @@ -30,11 +30,7 @@ #if !defined(AFX_TIME_FUNCS__H__INCLUDED_) #define AFX_TIME_FUNCS__H__INCLUDED_ - - -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 #include #include diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 4130ce44a3..bbf450035b 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -474,7 +474,7 @@ void TwitterProto::SendTweetWorker(void *p) if (p == 0) return; - char *text = static_cast(p); + char *text = mir_utf8encode((char *)p); if (strlen(text) > 140) { // looks like the chat max outgoing msg thing doesn't work, so i'll do it here. TCHAR errorPopup[280]; mir_sntprintf(errorPopup,SIZEOF(errorPopup), _T("Don't be crazy! Everyone knows the max tweet size is 140, and you're trying to fit %d chars in there?"), strlen(text)); @@ -483,7 +483,7 @@ void TwitterProto::SendTweetWorker(void *p) } ScopedLock s(twitter_lock_); - twit_.set_status(text); + twit_.set_status((char *)p); mir_free(text); } diff --git a/protocols/Xfire/src/SHA1.cpp b/protocols/Xfire/src/SHA1.cpp index 31267e43ef..36a3facb28 100644 --- a/protocols/Xfire/src/SHA1.cpp +++ b/protocols/Xfire/src/SHA1.cpp @@ -29,11 +29,7 @@ // Rotate x bits to the left #ifndef ROL32 -#ifdef _MSC_VER #define ROL32(_val32, _nBits) _rotl(_val32, _nBits) -#else -#define ROL32(_val32, _nBits) (((_val32)<<(_nBits))|((_val32)>>(32-(_nBits)))) -#endif #endif #ifdef SHA1_LITTLE_ENDIAN diff --git a/protocols/Xfire/src/SHA1.h b/protocols/Xfire/src/SHA1.h index b95a00970f..2bb15df86a 100644 --- a/protocols/Xfire/src/SHA1.h +++ b/protocols/Xfire/src/SHA1.h @@ -30,9 +30,7 @@ #include // Needed for strcat and strcpy #include -#ifdef _MSC_VER #include -#endif // If you're compiling big endian, just comment out the following line #define SHA1_LITTLE_ENDIAN @@ -46,22 +44,9 @@ #ifndef UINT_32 -#ifdef _MSC_VER - #define UINT_8 unsigned __int8 #define UINT_32 unsigned __int32 -#else - -#define UINT_8 unsigned char - -#if (ULONG_MAX == 0xFFFFFFFF) -#define UINT_32 unsigned long -#else -#define UINT_32 unsigned int -#endif - -#endif #endif diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index cc7e27f968..72c454639f 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -22,9 +22,7 @@ #include "resource.h" #include "file_transfer.h" -#ifdef _MSC_VER - #pragma warning(disable:4355) -#endif +#pragma warning(disable:4355) CYahooProto::CYahooProto( const char* aProtoName, const TCHAR* aUserName ) : PROTO(aProtoName, aUserName), -- cgit v1.2.3