From 35536f7c7adaabbc3ce014721992efd92f4548d4 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Mon, 10 Oct 2011 20:43:48 +0900 Subject: [PATCH] Disable daemon mode on OS/2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Denis-Courmont --- src/libvlc-module.c | 2 +- src/libvlc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 896187ccb1..7cd937ed76 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -2188,7 +2188,7 @@ vlc_module_begin () add_bool( "quiet", 0, QUIET_TEXT, QUIET_LONGTEXT, false ) change_short('q') -#if !defined(WIN32) +#if !defined(WIN32) && !defined(__OS2__) add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true ) change_short('d') diff --git a/src/libvlc.c b/src/libvlc.c index c8397d63af..44d7c6f4ab 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -95,7 +95,7 @@ * The evil global variables. We handle them with care, don't worry. *****************************************************************************/ -#ifndef WIN32 +#if !defined(WIN32) && !defined(__OS2__) static bool b_daemon = false; #endif @@ -777,7 +777,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) msg_Dbg( p_libvlc, "removing stats" ); -#ifndef WIN32 +#if !defined( WIN32 ) && !defined( __OS2__ ) char* psz_pidfile = NULL; if( b_daemon ) @@ -853,7 +853,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) char *psz_interface = var_CreateGetNonEmptyString( p_libvlc, "intf" ); if( !psz_interface ) /* "intf" has not been set */ { -#ifndef WIN32 +#if !defined( WIN32 ) && !defined( __OS2__ ) if( b_daemon ) /* Daemon mode hack. * We prefer the dummy interface if none is specified. */ -- 2.11.4.GIT