diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-11-06 11:23:15 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thb@documentfoundation.org> | 2013-11-20 07:15:16 -0600 |
| commit | f01580ce9c5f898c1fdb85e302a158f1a31205db (patch) | |
| tree | a49f1c99391904d8b4f96e6ff1a7160ce82d4461 /connectivity | |
| parent | d0c5f4522f8aa063b3e7c034db079d74b7f0b3fa (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 'connectivity')
| -rw-r--r-- | connectivity/Library_ado.mk | 6 | ||||
| -rw-r--r-- | connectivity/source/drivers/ado/ADriver.cxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index a62fcbafa1e1..0a559a3a8117 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -34,6 +34,12 @@ $(eval $(call gb_Library_use_system_win32_libs,ado,\ uuid \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_defs,ado,\ + -D_WIN32_WINNT=0x0502 \ +)) +endif + ifeq ($(WINDOWS_SDK_VERSION),80) $(eval $(call gb_Library_add_defs,ado,\ -DNTDDI_VERSION=0x0601 \ diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index f55a03f5f974..3daa811fcf14 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined _WIN32_WINNT -#undef _WIN32_WINNT -#endif -#define _WIN32_WINNT 0x0501 - #include "ado/ADriver.hxx" #include "ado/AConnection.hxx" #include "ado/Awrapadox.hxx" |