From 2a3b48f91c74e4d0115c26af702a4d2ffccfc805 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 24 Apr 2015 21:25:59 +0000 Subject: end of zoo with various _WIN32_WINNT versions git-svn-id: http://svn.miranda-ng.org/main/trunk@13112 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Dummy/src/stdafx.h | 4 ---- protocols/FacebookRM/src/common.h | 2 -- protocols/Gadu-Gadu/src/gg.h | 4 ---- protocols/IRCG/src/irc.h | 3 --- protocols/IcqOscarJ/src/icqoscar.h | 3 --- protocols/JabberG/src/jabber.h | 3 --- protocols/MRA/src/Mra.h | 2 -- protocols/Omegle/src/common.h | 3 --- protocols/Sametime/src/StdAfx.h | 1 - protocols/SkypeClassic/src/skypeopt.cpp | 3 +-- protocols/Tlen/src/tlen.h | 5 ----- protocols/Twitter/src/stdafx.h | 4 ---- protocols/VKontakte/src/stdafx.h | 4 ---- protocols/WhatsApp/src/common.h | 3 --- protocols/Xfire/src/stdafx.h | 4 ---- 15 files changed, 1 insertion(+), 47 deletions(-) (limited to 'protocols') diff --git a/protocols/Dummy/src/stdafx.h b/protocols/Dummy/src/stdafx.h index c6963da6e3..ac945252c3 100644 --- a/protocols/Dummy/src/stdafx.h +++ b/protocols/Dummy/src/stdafx.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - #include #include #include diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h index 7b459c9b3a..bb93847815 100644 --- a/protocols/FacebookRM/src/common.h +++ b/protocols/FacebookRM/src/common.h @@ -24,8 +24,6 @@ along with this program. If not, see . #pragma warning(disable:4996) -#define _WIN32_WINNT 0x0500 -#define _WIN32_WINDOWS 0x0500 #define _CRT_RAND_S #include diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h index 451555773b..c93923b8a4 100644 --- a/protocols/Gadu-Gadu/src/gg.h +++ b/protocols/Gadu-Gadu/src/gg.h @@ -26,10 +26,6 @@ #define DEBUGMODE // Debug Mode #endif -#if _WIN32_WINNT < 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #ifndef _WIN64 #define _USE_32BIT_TIME_T #endif diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h index c937c2f620..25518d16ec 100644 --- a/protocols/IRCG/src/irc.h +++ b/protocols/IRCG/src/irc.h @@ -22,9 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _IRCWIN_H_ #define _IRCWIN_H_ -#define _WIN32_WINNT 0x0501 -#define _WIN32_IE 0x0501 - #define _CRT_SECURE_NO_WARNINGS #define WIN32_LEAN_AND_MEAN diff --git a/protocols/IcqOscarJ/src/icqoscar.h b/protocols/IcqOscarJ/src/icqoscar.h index e1168b2428..c20297fd10 100644 --- a/protocols/IcqOscarJ/src/icqoscar.h +++ b/protocols/IcqOscarJ/src/icqoscar.h @@ -27,9 +27,6 @@ // Includes all header files that should be precompiled to speed up compilation. // ----------------------------------------------------------------------------- -#define _WIN32_WINNT 0x0501 -#define _WIN32_IE 0x0501 - // Windows includes #include #include diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h index 09448a9446..2c28b7e3aa 100644 --- a/protocols/JabberG/src/jabber.h +++ b/protocols/JabberG/src/jabber.h @@ -36,9 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /******************************************************************* * Global header files *******************************************************************/ -#define _WIN32_WINNT 0x601 -#define _WIN32_IE 0x601 - #include #include #include diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h index cea31c80f1..31ed1ac5f0 100644 --- a/protocols/MRA/src/Mra.h +++ b/protocols/MRA/src/Mra.h @@ -9,8 +9,6 @@ //#define CRTDLL #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define WINVER 0x0502 -#define _WIN32_WINNT 0x0502 #include #include diff --git a/protocols/Omegle/src/common.h b/protocols/Omegle/src/common.h index 863022a502..3b6b8b66bb 100644 --- a/protocols/Omegle/src/common.h +++ b/protocols/Omegle/src/common.h @@ -24,9 +24,6 @@ along with this program. If not, see . #pragma warning(disable:4996) -#define _WIN32_WINNT 0x0500 -#define _WIN32_WINDOWS 0x0500 - #include #include #include diff --git a/protocols/Sametime/src/StdAfx.h b/protocols/Sametime/src/StdAfx.h index 36de7f0cc8..7e2bb9e1e1 100644 --- a/protocols/Sametime/src/StdAfx.h +++ b/protocols/Sametime/src/StdAfx.h @@ -9,7 +9,6 @@ // Windows -#define _WIN32_WINNT 0x501 // for QueueUserAPC #include #include #include diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp index 7d7acc1e96..9cd32df960 100644 --- a/protocols/SkypeClassic/src/skypeopt.cpp +++ b/protocols/SkypeClassic/src/skypeopt.cpp @@ -3,10 +3,9 @@ #include "pthread.h" #include "gchat.h" #include "skypeprofile.h" -#if(WINVER >= 0x0500) + #include "uxtheme.h" #define HAVE_UXTHEMES -#endif #ifdef SKYPE_AUTO_DETECTION #include "ezxml/ezxml.c" diff --git a/protocols/Tlen/src/tlen.h b/protocols/Tlen/src/tlen.h index 1c513aba6d..7e0a43759b 100644 --- a/protocols/Tlen/src/tlen.h +++ b/protocols/Tlen/src/tlen.h @@ -24,11 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _TLEN_H_ #define _TLEN_H_ -#undef _WIN32_WINNT -#undef _WIN32_IE -#define _WIN32_WINNT 0x0501 -#define _WIN32_IE 0x0501 - #define __try #define __except(x) if (0) #define __finally diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h index 7fffc2807d..b3ea09eaac 100644 --- a/protocols/Twitter/src/stdafx.h +++ b/protocols/Twitter/src/stdafx.h @@ -5,10 +5,6 @@ #pragma once -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - #include #include #include diff --git a/protocols/VKontakte/src/stdafx.h b/protocols/VKontakte/src/stdafx.h index ab9e082dad..71153bf2b0 100644 --- a/protocols/VKontakte/src/stdafx.h +++ b/protocols/VKontakte/src/stdafx.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - #include #include #include diff --git a/protocols/WhatsApp/src/common.h b/protocols/WhatsApp/src/common.h index 009b0f0db7..e3e1ceb679 100644 --- a/protocols/WhatsApp/src/common.h +++ b/protocols/WhatsApp/src/common.h @@ -12,9 +12,6 @@ Copyright #pragma warning(disable:4996) #pragma warning(disable:4290) -#define _WIN32_WINNT 0x0601 -#define _WIN32_WINDOWS 0x0601 - #include #include #include diff --git a/protocols/Xfire/src/stdafx.h b/protocols/Xfire/src/stdafx.h index a11577c69c..eb20af3e4d 100644 --- a/protocols/Xfire/src/stdafx.h +++ b/protocols/Xfire/src/stdafx.h @@ -5,10 +5,6 @@ #pragma once -#ifndef _WIN32_WINNT // Lassen Sie die Verwendung spezifischer Features von Windows XP oder später zu. -#define _WIN32_WINNT 0x0501 // Ändern Sie dies in den geeigneten Wert für andere Versionen von Windows. -#endif - #include #include #include -- cgit v1.2.3