From 2ef20e45fe891791b6cf55731ca545daf11b58b9 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 16 Sep 2016 19:57:38 +0200 Subject: [PATCH] Revert "Change WINVER and _WIN32_WINNT to 0x0600 where applicable for issue #515" --- configure.in | 2 +- image/decoders/icon/win/nsIconChannel.cpp | 2 +- .../src/third_party/libevent/configure | 88 +++++++------------ .../src/third_party/libevent/configure.in | 12 +-- js/src/configure.in | 2 +- media/libcubeb/src/cubeb_winmm.c | 2 +- .../voice_engine/test/win_test/stdafx.h | 2 +- nsprpub/pr/include/private/primpl.h | 2 +- .../Resource/ProgressDialog/StdAfx.h | 4 +- .../nsis/Contrib/InetBgDL/InetBgDL.h | 2 +- 10 files changed, 46 insertions(+), 72 deletions(-) diff --git a/configure.in b/configure.in index 4fc500c68d..29612edf04 100644 --- a/configure.in +++ b/configure.in @@ -438,7 +438,7 @@ AC_SUBST(CRTEXPDLLVERSION) # Target the Windows 8.1 SDK by default WINSDK_TARGETVER=603 -WINVER=600 +WINVER=502 MOZ_ARG_WITH_STRING(windows-version, [ --with-windows-version=WINSDK_TARGETVER diff --git a/image/decoders/icon/win/nsIconChannel.cpp b/image/decoders/icon/win/nsIconChannel.cpp index a9d72c5ea0..2ed0f685ee 100644 --- a/image/decoders/icon/win/nsIconChannel.cpp +++ b/image/decoders/icon/win/nsIconChannel.cpp @@ -25,7 +25,7 @@ #include "nsDirectoryServiceDefs.h" #include "nsProxyRelease.h" -#ifdef _WIN32_WINNT && _WIN32_WINNT < 0x0600 +#ifdef _WIN32_WINNT #undef _WIN32_WINNT #endif #define _WIN32_WINNT 0x0600 diff --git a/ipc/chromium/src/third_party/libevent/configure b/ipc/chromium/src/third_party/libevent/configure index 5a238fd2de..2baeccca88 100755 --- a/ipc/chromium/src/third_party/libevent/configure +++ b/ipc/chromium/src/third_party/libevent/configure @@ -14015,29 +14015,27 @@ _ACEOF ac_fn_c_check_type "$LINENO" "struct in6_addr" "ac_cv_type_struct_in6_addr" "#define _GNU_SOURCE #include #ifdef HAVE_NETINET_IN_H -# include +#include #endif #ifdef HAVE_NETINET_IN6_H -# include +#include #endif #ifdef HAVE_SYS_SOCKET_H -# include +#include #endif #ifdef HAVE_NETDB_H -# include +#include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif -# define WIN32_LEAN_AND_MEAN -# if defined(_MSC_VER) && (_MSC_VER < 1300) -# include -# else -# include -# include -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 +#define WIN32_LEAN_AND_MEAN +#if defined(_MSC_VER) && (_MSC_VER < 1300) +#include +#else +#include +#include +#endif #endif " @@ -14064,10 +14062,8 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_i #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14101,10 +14097,8 @@ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "#define _GN #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14138,10 +14132,8 @@ ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "#de #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14175,10 +14167,8 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockad #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14209,10 +14199,8 @@ ac_fn_c_check_member "$LINENO" "struct in6_addr" "s6_addr32" "ac_cv_member_struc #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14242,10 +14230,8 @@ ac_fn_c_check_member "$LINENO" "struct in6_addr" "s6_addr16" "ac_cv_member_struc #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14275,10 +14261,8 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_stru #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14308,10 +14292,8 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_len" "ac_cv_member_st #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14341,10 +14323,8 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_memb #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -14374,10 +14354,8 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_me #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include diff --git a/ipc/chromium/src/third_party/libevent/configure.in b/ipc/chromium/src/third_party/libevent/configure.in index 9d8611b3c8..18165f32e5 100644 --- a/ipc/chromium/src/third_party/libevent/configure.in +++ b/ipc/chromium/src/third_party/libevent/configure.in @@ -570,10 +570,8 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t, struct addrin #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include @@ -595,10 +593,8 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #include #endif #ifdef WIN32 -# if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x600 -# endif +#define WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x400 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include diff --git a/js/src/configure.in b/js/src/configure.in index cb6303ea35..41b222fb3b 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -350,7 +350,7 @@ fi # Target the Windows 8.1 SDK by default WINSDK_TARGETVER=603 -WINVER=600 +WINVER=502 MOZ_ARG_WITH_STRING(windows-version, [ --with-windows-version=WINSDK_TARGETVER diff --git a/media/libcubeb/src/cubeb_winmm.c b/media/libcubeb/src/cubeb_winmm.c index b9e9c16a43..029c867c4a 100644 --- a/media/libcubeb/src/cubeb_winmm.c +++ b/media/libcubeb/src/cubeb_winmm.c @@ -6,7 +6,7 @@ */ #define __MSVCRT_VERSION__ 0x0700 #undef WINVER -#define WINVER 0x0600 +#define WINVER 0x0501 #undef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/media/webrtc/trunk/webrtc/voice_engine/test/win_test/stdafx.h b/media/webrtc/trunk/webrtc/voice_engine/test/win_test/stdafx.h index 661316c252..17b3c30eaa 100644 --- a/media/webrtc/trunk/webrtc/voice_engine/test/win_test/stdafx.h +++ b/media/webrtc/trunk/webrtc/voice_engine/test/win_test/stdafx.h @@ -26,7 +26,7 @@ // Modify the following defines if you have to target a platform prior to the ones specified below. // Refer to MSDN for the latest info on corresponding values for different platforms. #ifndef WINVER // Allow use of features specific to Windows XP or later. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. +#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows. #endif #ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. diff --git a/nsprpub/pr/include/private/primpl.h b/nsprpub/pr/include/private/primpl.h index 311626b740..63ba3ee46f 100644 --- a/nsprpub/pr/include/private/primpl.h +++ b/nsprpub/pr/include/private/primpl.h @@ -28,7 +28,7 @@ */ #if !defined(WINVER) || (WINVER < 0x0500) #undef WINVER -#define WINVER 0x0600 +#define WINVER 0x0500 #endif #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500) #undef _WIN32_WINNT diff --git a/other-licenses/7zstub/src/7zip/FileManager/Resource/ProgressDialog/StdAfx.h b/other-licenses/7zstub/src/7zip/FileManager/Resource/ProgressDialog/StdAfx.h index 8eed18ebea..6447c20642 100644 --- a/other-licenses/7zstub/src/7zip/FileManager/Resource/ProgressDialog/StdAfx.h +++ b/other-licenses/7zstub/src/7zip/FileManager/Resource/ProgressDialog/StdAfx.h @@ -3,10 +3,10 @@ #ifndef __STDAFX_H #define __STDAFX_H -#define _WIN32_WINNT 0x0600 +#define _WIN32_WINNT 0x0400 // it's for Windows NT supporting (MENUITEMINFOW) -#define WINVER 0x0600 +#define WINVER 0x0400 #include #include diff --git a/other-licenses/nsis/Contrib/InetBgDL/InetBgDL.h b/other-licenses/nsis/Contrib/InetBgDL/InetBgDL.h index e7e72d7b70..c7fabec2bb 100644 --- a/other-licenses/nsis/Contrib/InetBgDL/InetBgDL.h +++ b/other-licenses/nsis/Contrib/InetBgDL/InetBgDL.h @@ -14,7 +14,7 @@ # endif #endif -#define _WIN32_WINNT 0x0600 +#define _WIN32_WINNT 0x0400 #include #include #include