summaryrefslogtreecommitdiff
path: root/embedserv
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-11-06 11:23:15 +0100
committerThorsten Behrens <thb@documentfoundation.org>2013-11-20 07:15:16 -0600
commitf01580ce9c5f898c1fdb85e302a158f1a31205db (patch)
treea49f1c99391904d8b4f96e6ff1a7160ce82d4461 /embedserv
parentd0c5f4522f8aa063b3e7c034db079d74b7f0b3fa (diff)
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 <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
Diffstat (limited to 'embedserv')
-rw-r--r--embedserv/Library_emser.mk1
-rw-r--r--embedserv/source/embed/esdll.cxx1
-rw-r--r--embedserv/source/inc/stdafx.h2
3 files changed, 2 insertions, 2 deletions
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