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 /sal | |
| 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 'sal')
| -rw-r--r-- | sal/Library_sal.mk | 4 | ||||
| -rw-r--r-- | sal/osl/w32/file.cxx | 1 | ||||
| -rw-r--r-- | sal/osl/w32/file_dirvol.cxx | 1 | ||||
| -rw-r--r-- | sal/osl/w32/file_error.c | 1 | ||||
| -rw-r--r-- | sal/osl/w32/file_url.cxx | 1 | ||||
| -rw-r--r-- | sal/osl/w32/system.h | 5 | ||||
| -rw-r--r-- | sal/osl/w32/tempfile.cxx | 1 |
7 files changed, 4 insertions, 10 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 6ba73ee94fd9..cbc52a7212bf 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -229,6 +229,10 @@ else # $(OS) == WNT )) # .ENDIF +$(eval $(call gb_Library_add_defs,sal,\ + -D_WIN32_WINNT=0x0502 \ +)) + $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/w32/file \ sal/osl/w32/file_dirvol \ diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 87411d83d411..30a4f550a1f5 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -20,7 +20,6 @@ #define UNICODE #define _UNICODE -#define _WIN32_WINNT 0x0500 #include "systools/win32/uwinapi.h" #include "osl/file.hxx" diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index f3c97ecd26ab..071e29447176 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -19,7 +19,6 @@ #define UNICODE #define _UNICODE -#define _WIN32_WINNT 0x0500 #include "systools/win32/uwinapi.h" #include "osl/file.h" diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c index f1cd9ceab9e8..3bb2e49def9d 100644 --- a/sal/osl/w32/file_error.c +++ b/sal/osl/w32/file_error.c @@ -19,7 +19,6 @@ #define UNICODE #define _UNICODE -#define _WIN32_WINNT 0x0500 #include "systools/win32/uwinapi.h" #include "file_error.h" diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx index 228e88ed1941..978b8db29046 100644 --- a/sal/osl/w32/file_url.cxx +++ b/sal/osl/w32/file_url.cxx @@ -19,7 +19,6 @@ #define UNICODE #define _UNICODE -#define _WIN32_WINNT 0x0500 #include "systools/win32/uwinapi.h" #include "file_url.h" diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h index d74a587b853a..57a7a0fb6aa4 100644 --- a/sal/osl/w32/system.h +++ b/sal/osl/w32/system.h @@ -21,11 +21,6 @@ # define NO_DEBUG_CRT #endif -#ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x0400 -# define _CTYPE_DISABLE_MACROS /* wg. dynamischer C-Runtime MH */ -#endif - #include <stdio.h> #include <stdlib.h> #include <stdarg.h> diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx index 731dd4375333..d85410316b8f 100644 --- a/sal/osl/w32/tempfile.cxx +++ b/sal/osl/w32/tempfile.cxx @@ -19,7 +19,6 @@ #define UNICODE #define _UNICODE -#define _WIN32_WINNT 0x0500 #include "systools/win32/uwinapi.h" #include "osl/file.h" |