removed not needed _MSC_VER checks

removed double comstant from modern
warning fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@6087 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

16 files changed, 6 insertions, 70 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_defsettings.h b/plugins/Clist_modern/src/hdr/modern_defsettings.h
index dd7e451aaa..ca03dcdd6f 100644
--- a/plugins/Clist_modern/src/hdr/modern_defsettings.h
+++ b/plugins/Clist_modern/src/hdr/modern_defsettings.h
@@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define SETTING_TOOLWINDOW_DEFAULT              1 //"CList","ToolWindow"

 #define SETTING_ONTOP_DEFAULT                   0 //"CList","OnTop"

 #define SETTING_MIN2TRAY_DEFAULT                1 //"CList","Min2Tray"

-#define SETTING_TRAY1CLICK_DEFAULT              1 //"CList","Tray1Click"

 #define SETTING_HIDEOFFLINE_DEFAULT             0 //"CList", "HideOffline"

 #define SETTING_HIDEEMPTYGROUPS_DEFAULT         0 //"CList","HideEmptyGroups"

 #define SETTING_USEGROUPS_DEFAULT               1 //"CList","UseGroups"

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index d8ad4dda50..8a6e0eedb5 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -41,20 +41,18 @@ BOOL CALLBACK ProcessCLUIFrameInternalMsg(HWND hwnd, UINT msg, WPARAM wParam, LP
 void DestroyTrayMenu(HMENU hMenu);

 

 // new sources

-#ifdef _MSC_VER

 #include <crtdbg.h>

-#endif

 

 /* Global variables */

 

 UINT    g_dwMainThreadID = 0;

 HANDLE  g_hAwayMsgThread = 0, g_hGetTextAsyncThread = 0, g_hSmoothAnimationThread = 0;

-        

+

 HMENU   g_hMenuMain;

 BOOL    g_bTransparentFlag = FALSE;

 

-BOOL    g_mutex_bChangingMode = FALSE, g_mutex_bSizing = FALSE;        

-        

+BOOL    g_mutex_bChangingMode = FALSE, g_mutex_bSizing = FALSE;

+

 BOOL    g_flag_bOnModulesLoadedCalled = FALSE;

 

 RECT    g_rcEdgeSizingRect={0};

@@ -77,7 +75,7 @@ static BOOL mutex_bAnimationInProgress=FALSE,
             mutex_bDisableAutoUpdate=TRUE,

             mutex_bDuringSizing=FALSE,

             mutex_bDelayedSizing=FALSE;  //TBC is it need?

-            

+

 static BOOL flag_bFirstTimeCall=FALSE;

 

 static BOOL bTransparentFocus=TRUE,

@@ -92,7 +90,7 @@ static int nLastRequiredHeight=0,
            nRequiredHeight=0,

            nMirMenuState=0,

            nStatusMenuState=0;

- 

+

 static RECT rcNewWindowRect={0},

             rcOldWindowRect ={0},

             rcSizingRect={0},

diff --git a/plugins/CrashDumper/src/bkstring.h b/plugins/CrashDumper/src/bkstring.h
index 511ce2f173..8000723225 100644
--- a/plugins/CrashDumper/src/bkstring.h
+++ b/plugins/CrashDumper/src/bkstring.h
@@ -27,11 +27,7 @@ public:
 	typedef value_type* iterator;

 	typedef const value_type* const_iterator;

 

-#if defined(_MSC_VER) && _MSC_VER > 1200

 	static const size_type npos = size_type(-1);

-#else

-	enum { npos = -1 };

-#endif

 

 private:

 	value_type* buf;

diff --git a/plugins/CrashDumper/src/exhndlr.cpp b/plugins/CrashDumper/src/exhndlr.cpp
index f39e955e64..cee6cb283c 100644
--- a/plugins/CrashDumper/src/exhndlr.cpp
+++ b/plugins/CrashDumper/src/exhndlr.cpp
@@ -32,13 +32,7 @@ void RemoveExceptionHandler(void)
 

 void UnloadDbgHlp(void)

 {

-#ifdef _MSC_VER

-#if _MSC_VER > 1200

 	__FUnloadDelayLoadedDLL2("dbghelp.dll");

-#else

-	__FUnloadDelayLoadedDLL("dbghelp.dll");

-#endif

-#endif

 }

 

 int myDebugFilter(unsigned int code, PEXCEPTION_POINTERS ep)

@@ -163,7 +157,6 @@ DWORD MirandaThreadFilter(DWORD code, EXCEPTION_POINTERS* info)
 	return threadfltr(code, info);

 }

 

-#if _MSC_VER >= 1400

 void InvalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, UINT_PTR)

 {

 	EXCEPTION_RECORD         ExceptionRecord = {0};

@@ -191,13 +184,10 @@ void InvalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*, uns
 

 	myfilterWorker(&info, true);

 }

-#endif

 

 void InitExceptionHandler(void)

 {

-#if _MSC_VER >= 1400

 	_set_invalid_parameter_handler(InvalidParameterHandler);

-#endif

 	threadfltr = Miranda_SetExceptFilter(MirandaThreadFilter);

 	SetExceptionHandler();

 }

diff --git a/plugins/Exchange/Exchange_10.vcxproj b/plugins/Exchange/Exchange_10.vcxproj
index 6ded870fa3..d6602a2b7e 100644
--- a/plugins/Exchange/Exchange_10.vcxproj
+++ b/plugins/Exchange/Exchange_10.vcxproj
@@ -113,7 +113,6 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeaderFile>

       </PrecompiledHeaderFile>

     </ClCompile>

@@ -143,7 +142,6 @@
       <WarningLevel>Level3</WarningLevel>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeaderFile>

       </PrecompiledHeaderFile>

     </ClCompile>

@@ -173,7 +171,6 @@
       <StringPooling>true</StringPooling>

       <WarningLevel>Level3</WarningLevel>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeaderFile>

       </PrecompiledHeaderFile>

     </ClCompile>

@@ -202,7 +199,6 @@
       <Optimization>Disabled</Optimization>

       <WarningLevel>Level3</WarningLevel>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeaderFile>

       </PrecompiledHeaderFile>

     </ClCompile>

diff --git a/plugins/Exchange/Exchange_11.vcxproj b/plugins/Exchange/Exchange_11.vcxproj
index 261149983d..7ec1b7447b 100644
--- a/plugins/Exchange/Exchange_11.vcxproj
+++ b/plugins/Exchange/Exchange_11.vcxproj
@@ -117,7 +117,6 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeaderFile>

       </PrecompiledHeaderFile>

     </ClCompile>

@@ -148,7 +147,6 @@
       <WarningLevel>Level3</WarningLevel>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeaderFile>

       </PrecompiledHeaderFile>

     </ClCompile>

@@ -177,7 +175,6 @@
       <StringPooling>true</StringPooling>

       <WarningLevel>Level3</WarningLevel>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeaderFile>

       </PrecompiledHeaderFile>

     </ClCompile>

@@ -205,7 +202,6 @@
       <Optimization>Disabled</Optimization>

       <WarningLevel>Level3</WarningLevel>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeaderFile>

       </PrecompiledHeaderFile>

     </ClCompile>

diff --git a/plugins/Exchange/src/MirandaExchange.h b/plugins/Exchange/src/MirandaExchange.h
index 47f76d2107..17edac4a92 100644
--- a/plugins/Exchange/src/MirandaExchange.h
+++ b/plugins/Exchange/src/MirandaExchange.h
@@ -47,9 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define DEBUG

 

 

-#if _MSC_VER > 1000

 #pragma once

-#endif // _MSC_VER > 1000

 

 #define MAX_NUMBER_OF_HEADERS 512

 

diff --git a/plugins/Exchange/src/StdAfx.h b/plugins/Exchange/src/StdAfx.h
index 82627ab92d..052f158ce0 100644
--- a/plugins/Exchange/src/StdAfx.h
+++ b/plugins/Exchange/src/StdAfx.h
@@ -6,10 +6,7 @@
 #if !defined(AFX_STDAFX_H__B170AF8E_BA64_4233_BF83_B4F0D1F3B775__INCLUDED_)

 #define AFX_STDAFX_H__B170AF8E_BA64_4233_BF83_B4F0D1F3B775__INCLUDED_

 

-#if _MSC_VER > 1000

 #pragma once

-#endif // _MSC_VER > 1000

-

 

 // Insert your headers here

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

diff --git a/plugins/FlashAvatars/src/TigerHash.h b/plugins/FlashAvatars/src/TigerHash.h
index 33eb26ad8f..b738fb97b7 100644
--- a/plugins/FlashAvatars/src/TigerHash.h
+++ b/plugins/FlashAvatars/src/TigerHash.h
@@ -19,9 +19,7 @@
 #if !defined(TIGER_HASH_H)

 #define TIGER_HASH_H

 

-#if _MSC_VER > 1000

 #pragma once

-#endif // _MSC_VER > 1000

 

 typedef unsigned __int8 uint8_t;

 typedef unsigned __int32 uint32_t;

diff --git a/plugins/FlashAvatars/src/criticalsection.h b/plugins/FlashAvatars/src/criticalsection.h
index 6524b49559..7c9bcdaa9a 100644
--- a/plugins/FlashAvatars/src/criticalsection.h
+++ b/plugins/FlashAvatars/src/criticalsection.h
@@ -19,9 +19,7 @@
 #if !defined(CRITICAL_SECTION_H)

 #define CRITICAL_SECTION_H

 

-#if _MSC_VER > 1000

 #pragma once

-#endif // _MSC_VER > 1000

 

 class CriticalSection  

 {

diff --git a/plugins/FloatingContacts/src/fltcont.h b/plugins/FloatingContacts/src/fltcont.h
index 54ce7304d2..dc8f6ea15b 100644
--- a/plugins/FloatingContacts/src/fltcont.h
+++ b/plugins/FloatingContacts/src/fltcont.h
@@ -2,9 +2,7 @@
 #ifndef __FLTCONT_H__

 #define __FLTCONT_H__

 

-#if _MSC_VER >= 1000

 #pragma once

-#endif // _MSC_VER >= 1000

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/plugins/Ping/src/rawping.h b/plugins/Ping/src/rawping.h
index 635a220129..f5d9f877f5 100644
--- a/plugins/Ping/src/rawping.h
+++ b/plugins/Ping/src/rawping.h
@@ -14,11 +14,9 @@
 // Minimum ICMP packet size, in bytes

 #define ICMP_MIN 8

 

-#ifdef _MSC_VER

 // The following two structures need to be packed tightly, but unlike

 // Borland C++, Microsoft C++ does not do this by default.

 #pragma pack(1)

-#endif

 

 // The IP header

 struct IPHeader {

@@ -44,9 +42,7 @@ struct ICMPHeader {
     USHORT seq;

 };

 

-#ifdef _MSC_VER

 #pragma pack()

-#endif

 

 extern USHORT ip_checksum(USHORT* buffer, int size);

 

diff --git a/plugins/SecureIM/src/gettime.cpp b/plugins/SecureIM/src/gettime.cpp
index f38fe2e672..76ec52ede8 100644
--- a/plugins/SecureIM/src/gettime.cpp
+++ b/plugins/SecureIM/src/gettime.cpp
@@ -5,11 +5,7 @@
 const static long div_100_nsec = 10000000;

 

 /* POSIX or Unix Epoch (1-Jan-1970 00:00) in FILETIME units */

-#ifdef _MSC_VER

 const static ULONGLONG ix_epoch = 116444736000000000;

-#else

-const static ULONGLONG ix_epoch = 116444736000000000LL;

-#endif

 

 DWORD gettime(void)

 {

diff --git a/plugins/SmileyAdd/src/bkstring.h b/plugins/SmileyAdd/src/bkstring.h
index 3a43c2bece..f5752cb280 100644
--- a/plugins/SmileyAdd/src/bkstring.h
+++ b/plugins/SmileyAdd/src/bkstring.h
@@ -25,11 +25,7 @@ public:
 	typedef value_type* iterator;

 	typedef const value_type* const_iterator;

 

-#if defined(_MSC_VER) && (_MSC_VER <= 1200)

-	enum { npos = -1 };

-#else

 	static const size_type npos = size_type(-1);

-#endif

 

 private:

 	value_type* buf;

diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp
index ad11e50420..18cc673032 100644
--- a/plugins/SmileyAdd/src/general.cpp
+++ b/plugins/SmileyAdd/src/general.cpp
@@ -211,22 +211,18 @@ bool InitGdiPlus(void)
 	static const TCHAR errmsg[] = _T("GDI+ not installed.\n")

 		_T("GDI+ can be downloaded here: http://www.microsoft.com/downloads");

 

-#ifdef _MSC_VER

 	__try 

-#endif

 	{

 		if (g_gdiplusToken == 0 && !gdiPlusFail)

 		{

 			Gdiplus::GdiplusStartup(&g_gdiplusToken, &gdiplusStartupInput, NULL);

 		}

 	}

-#ifdef _MSC_VER

 	__except ( EXCEPTION_EXECUTE_HANDLER ) 

 	{

 		gdiPlusFail = true;

 		ReportError(errmsg);

 	}

-#endif

 

 	return !gdiPlusFail;

 }

@@ -236,13 +232,7 @@ void DestroyGdiPlus(void)
 	if (g_gdiplusToken != 0)

 	{

 		Gdiplus::GdiplusShutdown(g_gdiplusToken);

-#ifdef _MSC_VER

-#if 1200 < _MSC_VER  

 		__FUnloadDelayLoadedDLL2("gdiplus.dll");

-#else

-		__FUnloadDelayLoadedDLL("gdiplus.dll");

-#endif

-#endif

 		g_gdiplusToken = 0;

 	}

 }

diff --git a/plugins/StopSpamMod/src/utilities.cpp b/plugins/StopSpamMod/src/utilities.cpp
index 46707c67fa..73ab682878 100755
--- a/plugins/StopSpamMod/src/utilities.cpp
+++ b/plugins/StopSpamMod/src/utilities.cpp
@@ -222,13 +222,7 @@ tstring GetContactUid(HANDLE hContact, tstring Protocol)
 				mir_free((void *)ci.pszVal);

 			break;

 			case CNFT_DWORD:

-#if defined(_MSC_VER) && _MSC_VER >= 1300

-

-		_itoa_s(ci.dVal,aUid,32,10);

-#else

-		_itoa(ci.dVal,aUid,10);

-

-#endif

+				_itoa_s(ci.dVal,aUid,32,10);

 				OemToChar(aUid, dUid);

 				Uid=dUid;

 			break;