vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Nov 29 22:58:51 2016 +0200| [7118f0b05ba55b0406110730edd201a090cc41a9] | committer: Rémi Denis-Courmont
win32: use _WIN32_WINNT_WIN7 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7118f0b05ba55b0406110730edd201a090cc41a9 --- modules/codec/mft.c | 2 +- modules/video_output/win32/direct3d11.c | 4 ++-- src/win32/plugin.c | 2 +- src/win32/thread.c | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/codec/mft.c b/modules/codec/mft.c index 06b2395..25e9cfd 100644 --- a/modules/codec/mft.c +++ b/modules/codec/mft.c @@ -1105,7 +1105,7 @@ static int FindMFT(decoder_t *p_dec) static int LoadMFTLibrary(MFHandle *mf) { -#if _WIN32_WINNT < 0x601 || VLC_WINSTORE_APP +#if _WIN32_WINNT < _WIN32_WINNT_WIN7 || VLC_WINSTORE_APP mf->mfplat_dll = LoadLibrary(TEXT("mfplat.dll")); if (!mf->mfplat_dll) return VLC_EGENERIC; diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 973b8b0..99f86ad 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -21,9 +21,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x601 +#if !defined(_WIN32_WINNT) || _WIN32_WINNT < _WIN32_WINNT_WIN7 # undef _WIN32_WINNT -# define _WIN32_WINNT 0x601 +# define _WIN32_WINNT _WIN32_WINNT_WIN7 #endif #ifdef HAVE_CONFIG_H diff --git a/src/win32/plugin.c b/src/win32/plugin.c index 22ee38c..e1a37ae 100644 --- a/src/win32/plugin.c +++ b/src/win32/plugin.c @@ -35,7 +35,7 @@ extern DWORD LoadLibraryFlags; -#if (_WIN32_WINNT < 0x601) +#if (_WIN32_WINNT < _WIN32_WINNT_WIN7) static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) { /* TODO: cache the pointer */ diff --git a/src/win32/thread.c b/src/win32/thread.c index 10e1a49..b55c7f5 100644 --- a/src/win32/thread.c +++ b/src/win32/thread.c @@ -693,7 +693,7 @@ void vlc_control_cancel (int cmd, ...) /*** Clock ***/ static union { -#if (_WIN32_WINNT < 0x0601) +#if (_WIN32_WINNT < _WIN32_WINNT_WIN7) struct { BOOL (*query) (PULONGLONG); @@ -716,7 +716,7 @@ static mtime_t mdate_interrupt (void) ULONGLONG ts; BOOL ret; -#if (_WIN32_WINNT >= 0x0601) +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) ret = QueryUnbiasedInterruptTime (&ts); #else ret = clk.interrupt.query (&ts); @@ -853,7 +853,7 @@ static void SelectClockSource (vlc_object_t *obj) if (!strcmp (name, "interrupt")) { msg_Dbg (obj, "using interrupt time as clock source"); -#if (_WIN32_WINNT < 0x0601) +#if (_WIN32_WINNT < _WIN32_WINNT_WIN7) HANDLE h = GetModuleHandle (_T("kernel32.dll")); if (unlikely(h == NULL)) abort (); @@ -924,7 +924,7 @@ size_t EnumClockSource (vlc_object_t *obj, const char *var, char **names = xmalloc (sizeof (*names) * max); size_t n = 0; -#if (_WIN32_WINNT < 0x0601) +#if (_WIN32_WINNT < _WIN32_WINNT_WIN7) DWORD version = LOWORD(GetVersion()); version = (LOBYTE(version) << 8) | (HIBYTE(version) << 0); #endif @@ -932,7 +932,7 @@ size_t EnumClockSource (vlc_object_t *obj, const char *var, values[n] = xstrdup (""); names[n] = xstrdup (_("Auto")); n++; -#if (_WIN32_WINNT < 0x0601) +#if (_WIN32_WINNT < _WIN32_WINNT_WIN7) if (version >= 0x0601) #endif { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
