I422_YUY2: clobber lists for MMX and SSE2

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index e615f058bd5c3e9a56ed52cea342ef0097002bdd..ef517d4ab91a5a5380b3d68578aeb273a3f24543 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -47,17 +47,14 @@
 #include <string.h>
 #include <stdlib.h>                                                /* free() */
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#elif defined( WIN32 ) && !defined( UNDER_CE )
-#   include <io.h>
-#endif
-
 #include "config/vlc_getopt.h"
 
 #ifdef HAVE_LOCALE_H
 #   include <locale.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#   include <unistd.h> /* isatty() */
+#endif
 
 #ifdef HAVE_DBUS
 /* used for one-instance mode */
@@ -95,7 +92,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
 
@@ -536,6 +533,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /* 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 );
+
     /* Create a variable for showing the right click menu */
     var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
 
@@ -702,7 +702,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-nsobject", VLC_VAR_ADDRESS );
 #endif
-#ifdef WIN32
+#if defined (WIN32) || defined (__OS2__)
     var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_INTEGER );
 #endif
 
@@ -774,7 +774,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 )
@@ -850,7 +850,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. */