Skip to content

V
vlc-gpu
Commit 35536f7c authored by KO Myung-Hun's avatar KO Myung-Hun Committed by Rémi Denis-Courmont
Browse files
Options

Disable daemon mode on OS/2 

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent f04b841f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/libvlc-module.c
View file @ 35536f7c
...@@ -2188,7 +2188,7 @@ vlc_module_begin () ...@@ -2188,7 +2188,7 @@ vlc_module_begin ()
add_bool( "quiet", 0, QUIET_TEXT, QUIET_LONGTEXT, false ) add_bool( "quiet", 0, QUIET_TEXT, QUIET_LONGTEXT, false )
change_short('q') change_short('q')
#if !defined(WIN32) #if !defined(WIN32) && !defined(__OS2__)
add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true ) add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true )
change_short('d') change_short('d')
......
src/libvlc.c
View file @ 35536f7c
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
* The evil global variables. We handle them with care, don't worry. * The evil global variables. We handle them with care, don't worry.
*****************************************************************************/ *****************************************************************************/
#ifndef WIN32 #if !defined(WIN32) && !defined(__OS2__)
static bool b_daemon = false; static bool b_daemon = false;
#endif #endif
...@@ -777,7 +777,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) ...@@ -777,7 +777,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
msg_Dbg( p_libvlc, "removing stats" ); msg_Dbg( p_libvlc, "removing stats" );
#ifndef WIN32 #if !defined( WIN32 ) && !defined( __OS2__ )
char* psz_pidfile = NULL; char* psz_pidfile = NULL;
if( b_daemon ) if( b_daemon )
...@@ -853,7 +853,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) ...@@ -853,7 +853,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module )
char *psz_interface = var_CreateGetNonEmptyString( p_libvlc, "intf" ); char *psz_interface = var_CreateGetNonEmptyString( p_libvlc, "intf" );
if( !psz_interface ) /* "intf" has not been set */ if( !psz_interface ) /* "intf" has not been set */
{ {
#ifndef WIN32 #if !defined( WIN32 ) && !defined( __OS2__ )
if( b_daemon ) if( b_daemon )
/* Daemon mode hack. /* Daemon mode hack.
* We prefer the dummy interface if none is specified. */ * We prefer the dummy interface if none is specified. */
......
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