Commit a490cbb6 authored by Geoffroy Couprie's avatar Geoffroy Couprie

Remove IS_WINNT macro

parent e53c94ea
......@@ -498,11 +498,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
#if defined( WIN32 ) || defined( UNDER_CE )
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# if defined( UNDER_CE )
# define IS_WINNT 0
# else
# define IS_WINNT ( GetVersion() < 0x80000000 )
# endif
#endif
#include "vlc_mtime.h"
......
......@@ -79,15 +79,14 @@
/* Define different priorities for WinNT/2K/XP and Win9x/Me */
# define VLC_THREAD_PRIORITY_LOW 0
# define VLC_THREAD_PRIORITY_INPUT \
(IS_WINNT ? THREAD_PRIORITY_ABOVE_NORMAL : 0)
THREAD_PRIORITY_ABOVE_NORMAL
# define VLC_THREAD_PRIORITY_AUDIO \
(IS_WINNT ? THREAD_PRIORITY_HIGHEST : 0)
# define VLC_THREAD_PRIORITY_VIDEO \
(IS_WINNT ? 0 : THREAD_PRIORITY_BELOW_NORMAL )
THREAD_PRIORITY_HIGHEST
# define VLC_THREAD_PRIORITY_VIDEO 0
# define VLC_THREAD_PRIORITY_OUTPUT \
(IS_WINNT ? THREAD_PRIORITY_ABOVE_NORMAL : 0)
THREAD_PRIORITY_ABOVE_NORMAL
# define VLC_THREAD_PRIORITY_HIGHEST \
(IS_WINNT ? THREAD_PRIORITY_TIME_CRITICAL : 0)
THREAD_PRIORITY_TIME_CRITICAL
#else
# define VLC_THREAD_PRIORITY_LOW 0
......
......@@ -264,7 +264,7 @@ block_t *screen_Capture( demux_t *p_demux )
p_sys->fmt.video.i_width, p_data->i_fragment_size,
p_data->hdc_src, p_sys->i_left, p_sys->i_top +
p_data->i_fragment * p_data->i_fragment_size,
IS_WINNT ? SRCCOPY | CAPTUREBLT : SRCCOPY ) )
SRCCOPY | CAPTUREBLT ) )
{
msg_Err( p_demux, "error during BitBlt()" );
return NULL;
......
......@@ -107,9 +107,6 @@ static int Activate( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
/* Only works on NT/2K/XP */
if( !IS_WINNT ) return VLC_EGENERIC;
p_intf->pf_run = Run;
return VLC_SUCCESS;
}
......
......@@ -262,9 +262,7 @@ char *ToLocaleDup (const char *utf8)
*/
int utf8_open (const char *filename, int flags, mode_t mode)
{
#if defined (WIN32) || defined (UNDER_CE)
if (GetVersion() < 0x80000000)
{
#ifdef WIN32
/* for Windows NT and above */
wchar_t wpath[MAX_PATH + 1];
......@@ -280,7 +278,7 @@ int utf8_open (const char *filename, int flags, mode_t mode)
* We use _wopen() instead. Same thing for mkdir() and stat().
*/
return _wopen (wpath, flags, mode);
}
#endif
const char *local_name = ToLocale (filename);
......@@ -573,10 +571,7 @@ int utf8_scandir( const char *dirname, char ***namelist,
static int utf8_statEx( const char *filename, struct stat *buf,
bool deref )
{
#if defined (WIN32) || defined (UNDER_CE)
/* retrieve Windows OS version */
if( GetVersion() < 0x80000000 )
{
#if defined (WIN32)
/* for Windows NT and above */
wchar_t wpath[MAX_PATH + 1];
......@@ -588,7 +583,7 @@ static int utf8_statEx( const char *filename, struct stat *buf,
wpath[MAX_PATH] = L'\0';
return _wstati64( wpath, buf );
}
#endif
#ifdef HAVE_SYS_STAT_H
const char *local_name = ToLocale( filename );
......@@ -636,9 +631,7 @@ int utf8_lstat( const char *filename, struct stat *buf)
*/
int utf8_unlink( const char *filename )
{
#if defined (WIN32) || defined (UNDER_CE)
if( GetVersion() < 0x80000000 )
{
#if defined (WIN32)
/* for Windows NT and above */
wchar_t wpath[MAX_PATH + 1];
......@@ -654,7 +647,6 @@ int utf8_unlink( const char *filename )
* We use _wunlink() instead.
*/
return _wunlink( wpath );
}
#endif
const char *local_name = ToLocale( filename );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment