Enable 'high-priority' option on OS/2

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 335687ee084fec14b90d3b3b8cc598058ce5baf3..44d7c6f4ab77154a7a90c95bed974bf5dd8a8265 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -37,7 +37,7 @@
 #endif
 
 #include <vlc_common.h>
-#include "control/libvlc_internal.h"
+#include "../lib/libvlc_internal.h"
 #include <vlc_input.h>
 
 #include "modules/modules.h"
@@ -47,10 +47,6 @@
 #include <string.h>
 #include <stdlib.h>                                                /* free() */
 
-#ifndef WIN32
-#   include <netinet/in.h>                            /* BSD: struct in_addr */
-#endif
-
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #elif defined( WIN32 ) && !defined( UNDER_CE )
@@ -99,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
 
@@ -534,8 +530,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     priv->actions = vlc_InitActions( p_libvlc );
 
     /* Create a variable for showing the fullscreen interface */
+    var_Create( p_libvlc, "intf-toggle-fscontrol", VLC_VAR_BOOL );
+    var_SetBool( p_libvlc, "intf-toggle-fscontrol", true );
+
+    /* Create a variable for the Boss Key */
+    var_Create( p_libvlc, "intf-boss", VLC_VAR_VOID );
+
+    /* Create a variable for showing the main interface */
     var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
-    var_SetBool( p_libvlc, "intf-show", true );
 
     /* Create a variable for showing the right click menu */
     var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
@@ -775,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 )
@@ -851,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. */