Commit cd437524 authored by Sam Hocevar's avatar Sam Hocevar

  * Win32 and Solaris compilation fix.
parent 239e959a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_sdl.c: SDL video output display method * vout_sdl.c: SDL video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: vout_sdl.c,v 1.85 2002/03/18 19:14:52 sam Exp $ * $Id: vout_sdl.c,v 1.86 2002/03/20 14:08:55 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org> * Pierre Baillet <oct@zoy.org>
...@@ -154,7 +154,9 @@ void _M( vout_getfunctions )( function_list_t * p_function_list ) ...@@ -154,7 +154,9 @@ void _M( vout_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int vout_Create( vout_thread_t *p_vout ) static int vout_Create( vout_thread_t *p_vout )
{ {
#ifdef HAVE_SETENV
char *psz_method; char *psz_method;
#endif
if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 ) if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 )
{ {
...@@ -169,6 +171,7 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -169,6 +171,7 @@ static int vout_Create( vout_thread_t *p_vout )
return( 1 ); return( 1 );
} }
#ifdef HAVE_SETENV
psz_method = config_GetPszVariable( "vout" ); psz_method = config_GetPszVariable( "vout" );
if( psz_method ) if( psz_method )
{ {
...@@ -182,6 +185,7 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -182,6 +185,7 @@ static int vout_Create( vout_thread_t *p_vout )
setenv( "SDL_VIDEODRIVER", psz_method + 1, 1 ); setenv( "SDL_VIDEODRIVER", psz_method + 1, 1 );
} }
} }
#endif
/* Initialize library */ /* Initialize library */
if( SDL_Init( SDL_INIT_VIDEO if( SDL_Init( SDL_INIT_VIDEO
......
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