[vlc-commits] win32: use _WIN32_WINNT_VISTA

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 29 22:58:27 2016 +0200| [91ad414900176c0c9490bf0698380e30d0e19190] | committer: Rémi Denis-Courmont

win32: use _WIN32_WINNT_VISTA

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=91ad414900176c0c9490bf0698380e30d0e19190
---

 modules/audio_output/mmdevice.c    | 4 ++--
 modules/audio_output/wasapi.c      | 4 ++--
 modules/codec/avcodec/directx_va.h | 4 ++--
 src/win32/thread.c                 | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c
index 161fde8..1e16a4c 100644
--- a/modules/audio_output/mmdevice.c
+++ b/modules/audio_output/mmdevice.c
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x600
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < _WIN32_WINNT_VISTA
 # undef _WIN32_WINNT
-# define _WIN32_WINNT 0x600
+# define _WIN32_WINNT _WIN32_WINNT_VISTA
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 4ad4ac2..1ed39b5 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x600
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < _WIN32_WINNT_VISTA
 # undef _WIN32_WINNT
-# define _WIN32_WINNT 0x600
+# define _WIN32_WINNT _WIN32_WINNT_VISTA
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/modules/codec/avcodec/directx_va.h b/modules/codec/avcodec/directx_va.h
index ad20ead..0561dcd 100644
--- a/modules/codec/avcodec/directx_va.h
+++ b/modules/codec/avcodec/directx_va.h
@@ -28,10 +28,10 @@
 #ifndef AVCODEC_DIRECTX_VA_H
 #define AVCODEC_DIRECTX_VA_H
 
-# if _WIN32_WINNT < 0x600
+# if _WIN32_WINNT < _WIN32_WINNT_VISTA
 /* d3d11 needs Vista support */
 #  undef _WIN32_WINNT
-#  define _WIN32_WINNT 0x600
+#  define _WIN32_WINNT _WIN32_WINNT_VISTA
 # endif
 
 #include <vlc_common.h>
diff --git a/src/win32/thread.c b/src/win32/thread.c
index 740f7a2..10e1a49 100644
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -699,7 +699,7 @@ static union
         BOOL (*query) (PULONGLONG);
     } interrupt;
 #endif
-#if (_WIN32_WINNT < 0x0600)
+#if (_WIN32_WINNT < _WIN32_WINNT_VISTA)
     struct
     {
         ULONGLONG (*get) (void);
@@ -731,7 +731,7 @@ static mtime_t mdate_interrupt (void)
 
 static mtime_t mdate_tick (void)
 {
-#if (_WIN32_WINNT >= 0x0600)
+#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA)
     ULONGLONG ts = GetTickCount64 ();
 #else
     ULONGLONG ts = clk.tick.get ();
@@ -868,7 +868,7 @@ static void SelectClockSource (vlc_object_t *obj)
     if (!strcmp (name, "tick"))
     {
         msg_Dbg (obj, "using Windows time as clock source");
-#if (_WIN32_WINNT < 0x0600)
+#if (_WIN32_WINNT < _WIN32_WINNT_VISTA)
         HANDLE h = GetModuleHandle (_T("kernel32.dll"));
         if (unlikely(h == NULL))
             abort ();
@@ -940,7 +940,7 @@ size_t EnumClockSource (vlc_object_t *obj, const char *var,
         names[n] = xstrdup ("Interrupt time");
         n++;
     }
-#if (_WIN32_WINNT < 0x0600)
+#if (_WIN32_WINNT < _WIN32_WINNT_VISTA)
     if (version >= 0x0600)
 #endif
     {