More cleanup

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index 6308970931d3cd6841cf386b3ac6b67d67be8547..2f2750ad55f4d6b391a7ed8696e48b346563b6d5 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc.c: the vlc player
  *****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
+ * Copyright (C) 1998-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -22,7 +22,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include "config.h"
@@ -45,6 +45,8 @@
 static void SigHandler  ( int i_signal );
 #endif
 
+extern void rootwrap( void );
+
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
@@ -52,7 +54,7 @@ int main( int i_argc, char *ppsz_argv[] )
 {
     int i_ret;
 
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
     /* This clutters OSX GUI error logs */
     fprintf( stderr, "VLC media player %s\n", VLC_Version() );
 #endif
@@ -73,6 +75,8 @@ int main( int i_argc, char *ppsz_argv[] )
     }
 #endif
 
+    rootwrap ();
+    
     /* Create a libvlc structure */
     i_ret = VLC_Create();
     if( i_ret < 0 )
@@ -99,7 +103,7 @@ int main( int i_argc, char *ppsz_argv[] )
     if( i_ret < 0 )
     {
         VLC_Destroy( 0 );
-        return i_ret;
+        return i_ret == VLC_EEXITSUCCESS ? 0 : i_ret;
     }
 
     i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
@@ -157,7 +161,9 @@ static void SigHandler( int i_signal )
 #endif
 
 #if defined(UNDER_CE)
-#include "vlc_common.h"
+#   if defined( _MSC_VER ) && defined( UNDER_CE )
+#       include "vlc_common.h"
+#   endif
 /*****************************************************************************
  * WinMain: parse command line, start interface and spawn threads. (WinCE only)
  *****************************************************************************/