diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-01-19 18:18:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-01-19 20:31:38 +0000 |
| commit | 4500afcc1be7774b3c35ab69a20e36165ca5445a (patch) | |
| tree | f010aced19eebb1241fa1c54469a57816e0bf209 /avmedia/source | |
| parent | 913f777c08ce3f089d3155ed77338c9be26abc90 (diff) | |
try to fix GetVersionEx deprecation warnings from Windows SDK 8.1
Apparently GetVersionEx() is deprecated now, but the replacement header
"versionhelpers.h" does not exist in older SDKs (at least not in 8.0),
so try to determine the used SDK version by checking if the Windows 8.1
version constant _WIN32_WINNT_WINBLUE (0x0602) exists.
http://msdn.microsoft.com/en-us/library/windows/desktop/dn424972%28v=vs.85%29.aspx
Change-Id: Ia9224a8c76823ada7cb294a600046c6a0fc843ad
Reviewed-on: https://gerrit.libreoffice.org/14020
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'avmedia/source')
| -rw-r--r-- | avmedia/source/win/player.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index baf72ad9e6cf..1d7040ba9c0b 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -68,12 +68,17 @@ LRESULT CALLBACK MediaPlayerWndProc_2( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM bool isWindowsVistaOrHigher() { +// the Win32 SDK 8.1 deprecates GetVersionEx() +#ifdef _WIN32_WINNT_WINBLUE + return IsWindowsVistaOrGreater() ? true : false; +#else // POST: return true if we are at least on Windows Vista OSVERSIONINFO osvi; ZeroMemory(&osvi, sizeof(osvi)); osvi.dwOSVersionInfoSize = sizeof(osvi); GetVersionEx(&osvi); return osvi.dwMajorVersion >= 6; +#endif } |