* modules/gui/skins/src/skin_main.cpp, modules/gui/wxwindows/wxwindows.cpp:

    Do not unload the WxWindows plugins on Unix, because they might be linked
    with Gtk which makes evil use of atexit().

diff --git a/modules/gui/skins/src/skin_main.cpp b/modules/gui/skins/src/skin_main.cpp
index 87366de8336da7a7ed0780b8f7e4176435fee162..8d5811d3b18bd9d69637811e649a53da32e71808 100644 (file)
--- a/modules/gui/skins/src/skin_main.cpp
+++ b/modules/gui/skins/src/skin_main.cpp
@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.42 2003/06/23 20:35:36 asmax Exp $
+ * $Id: skin_main.cpp,v 1.43 2003/07/05 15:35:28 sam Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -367,6 +367,9 @@ vlc_module_begin();
     set_description( _("Skinnable Interface") );
     set_capability( "interface", 30 );
     set_callbacks( Open, Close );
+#if !defined(WIN32) && !defined(MODULE_NAME_IS_basic_skins)
+    linked_with_a_crap_library_which_uses_atexit();
+#endif
 vlc_module_end();
 
 

diff --git a/modules/gui/wxwindows/wxwindows.cpp b/modules/gui/wxwindows/wxwindows.cpp
index 5303b49061b8faa66853de2560caee0ccc1b0177..38b51895a9a391745dabf545d5e08bd733f7d583 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.cpp
+++ b/modules/gui/wxwindows/wxwindows.cpp
@@ -2,7 +2,7 @@
  * wxwindows.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: wxwindows.cpp,v 1.16 2003/06/05 21:22:28 gbazin Exp $
+ * $Id: wxwindows.cpp,v 1.17 2003/07/05 15:35:28 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -86,6 +86,9 @@ vlc_module_begin();
     add_shortcut( "wxwin" );
     add_shortcut( "wx" );
     set_program( "wxvlc" );
+#if !defined(WIN32)
+    linked_with_a_crap_library_which_uses_atexit();
+#endif
 vlc_module_end();
 
 /*****************************************************************************