From f01580ce9c5f898c1fdb85e302a158f1a31205db Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 6 Nov 2013 11:23:15 +0100 Subject: Windows: Require at least Windows XP SP2 * Windows XP SP2 is 0x0502, see http://msdn.microsoft.com/en-us/library/aa383745.aspx * If a module changes the Windows SDK version setting, this is done module wide now. So the overall behavior is as before. This seems to be the best compromise for now. * We need at least SP2 because of the bluetooth stuff used in sd/source/ui/remotecontrol. * Now, we require at least Internet Explorer 7.0. IE6 has been outdated for a long time. * Leave StdAfx.h file definitions, as those are Microsoft project specific precompiled header files. * All local definitions of WINVER are removed, because the global WINVER setting makes them obsolete now. To the relation of the three macros: Setting _WIN32_WINNT sets WINVER and NTDDI_VERSION automatically to the same value as _WIN32_WINNT. WINVER and NTDDI_VERSION can be set idenpendently each for itself. Change-Id: Ibcc12493aae4fcaf7bcfda88be99c1b61bc326cb Reviewed-on: https://gerrit.libreoffice.org/6496 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- embedserv/Library_emser.mk | 1 + embedserv/source/embed/esdll.cxx | 1 - embedserv/source/inc/stdafx.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'embedserv') diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 5458ed2bd33e..a85e4c70cf83 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,emser,\ $(eval $(call gb_Library_add_defs,emser,\ -UNOMINMAX \ + -D_WIN32_WINNT=0x0502 \ )) $(eval $(call gb_Library_use_external,emser,boost_headers)) diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx index b5aa6b7a2762..52f8013738c2 100644 --- a/embedserv/source/embed/esdll.cxx +++ b/embedserv/source/embed/esdll.cxx @@ -18,7 +18,6 @@ */ #define STRICT -#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM #ifdef _MSC_VER #pragma warning(disable : 4917 4555) diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h index d3109ddf9b91..abfc022a935e 100644 --- a/embedserv/source/inc/stdafx.h +++ b/embedserv/source/inc/stdafx.h @@ -8,7 +8,7 @@ #define STRICT #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0403 +#define _WIN32_WINNT 0x0502 #endif #define _ATL_APARTMENT_THREADED // #define _ATL_STATIC_REGISTRY -- cgit v1.2.3