[vlc-commits] Disable daemon mode on OS/2

[KO Myung-Hun]

vlc | branch: master | KO Myung-Hun <komh at chollian.net> | Mon Oct 10 20:43:48 2011 +0900| [35536f7c7adaabbc3ce014721992efd92f4548d4] | committer: Rémi Denis-Courmont

Disable daemon mode on OS/2

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

 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 896187c..7cd937e 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 c8397d6..44d7c6f 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. */