Twolame: fix copyright header, and remove unnecessary includes

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index c8397d63af41c0147ffcc324de3ca4324aee8548..021f9f0a44fdc70860fab6a9486535a2b8968f73 100644 (file)
--- 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
 
@@ -705,7 +705,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
 
@@ -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. */