From b63326b733936482b4e7ddf7d58bf9bb4d59ec92 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sat, 13 Mar 2010 18:18:00 +0200
Subject: [PATCH] Rename linked_with_a_crap_library_which_uses_atexit()

In several cases, it is not used because of atexit().
---
 include/vlc_plugin.h                | 2 +-
 modules/gui/macosx/macosx.m         | 2 +-
 modules/gui/qt4/qt4.cpp             | 2 +-
 modules/misc/xml/libxml.c           | 2 +-
 modules/services_discovery/mtp.c    | 2 +-
 modules/video_output/msw/direct3d.c | 2 +-
 modules/video_output/msw/directx.c  | 2 +-
 modules/video_output/msw/glwin32.c  | 2 +-
 modules/video_output/sdl.c          | 2 +-
 modules/video_output/svgalib.c      | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 739994704c..dd881a35d3 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -226,7 +226,7 @@ enum vlc_module_properties
      || vlc_module_set (p_submodule, VLC_MODULE_CB_CLOSE, deactivate)) \
         goto error;
 
-#define linked_with_a_crap_library_which_uses_atexit( ) \
+#define cannot_unload_broken_library( ) \
     if (vlc_module_set (p_submodule, VLC_MODULE_NO_UNLOAD)) \
         goto error;
 
diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index cb78882653..5346b0a2a4 100644
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -105,7 +105,7 @@ vlc_module_begin ()
     set_callbacks( OpenIntf, CloseIntf )
     set_category( CAT_INTERFACE )
     set_subcategory( SUBCAT_INTERFACE_MAIN )
-    linked_with_a_crap_library_which_uses_atexit( )
+    cannot_unload_broken_library( )
     add_bool( "macosx-autoplay", true, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT,
               false )
     add_bool( "macosx-recentitems", true, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT,
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index d633d8a5d9..fa39760a71 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -239,7 +239,7 @@ vlc_module_begin ()
     add_obsolete_integer( "qt-display-mode" ) /* Suppressed since 1.1.0 */
 
 #ifdef WIN32
-    linked_with_a_crap_library_which_uses_atexit()
+    cannot_unload_broken_library()
 #endif
 
     add_submodule ()
diff --git a/modules/misc/xml/libxml.c b/modules/misc/xml/libxml.c
index 80c44a5252..540579318f 100644
--- a/modules/misc/xml/libxml.c
+++ b/modules/misc/xml/libxml.c
@@ -47,7 +47,7 @@ vlc_module_begin ()
     set_callbacks( Open, Close )
 
 #ifdef WIN32
-    linked_with_a_crap_library_which_uses_atexit()
+    cannot_unload_broken_library()
 #endif
 
 vlc_module_end ()
diff --git a/modules/services_discovery/mtp.c b/modules/services_discovery/mtp.c
index c85d7755d6..a63a9f8dff 100644
--- a/modules/services_discovery/mtp.c
+++ b/modules/services_discovery/mtp.c
@@ -47,7 +47,7 @@ vlc_module_begin()
     set_subcategory( SUBCAT_PLAYLIST_SD )
     set_capability( "services_discovery", 0 )
     set_callbacks( Open, Close )
-    linked_with_a_crap_library_which_uses_atexit()
+    cannot_unload_broken_library()
 
     VLC_SD_PROBE_SUBMODULE
 vlc_module_end()
diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index dce4e039dc..d62775634a 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -74,7 +74,7 @@ vlc_module_begin ()
     set_callbacks(OpenVideoXP, Close)
 
     /* FIXME: Hack to avoid unregistering our window class */
-    linked_with_a_crap_library_which_uses_atexit()
+    cannot_unload_broken_library()
 
     add_submodule()
         set_capability("vout display", 150)
diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index 5e05a2fc5c..827c81bd08 100644
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -116,7 +116,7 @@ vlc_module_begin()
     set_callbacks(Open, Close)
 
     /* FIXME: Hack to avoid unregistering our window class */
-    linked_with_a_crap_library_which_uses_atexit()
+    cannot_unload_broken_library()
 vlc_module_end()
 
 #if 0 /* FIXME */
diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 2e2b240948..f120069ca2 100644
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -59,7 +59,7 @@ vlc_module_begin()
     set_callbacks(Open, Close)
 
     /* FIXME: Hack to avoid unregistering our window class */
-    linked_with_a_crap_library_which_uses_atexit ()
+    cannot_unload_broken_library ()
 vlc_module_end()
 
 #if 0 /* FIXME */
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 579a8cd81c..b67b755712 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -69,7 +69,7 @@ vlc_module_begin()
     set_callbacks(Open, Close)
 #if defined(__i386__) || defined(__x86_64__)
     /* On i386, SDL is linked against svgalib */
-    linked_with_a_crap_library_which_uses_atexit()
+    cannot_unload_broken_library()
 #endif
 vlc_module_end()
 
diff --git a/modules/video_output/svgalib.c b/modules/video_output/svgalib.c
index fb50526cbc..d66bc947c9 100644
--- a/modules/video_output/svgalib.c
+++ b/modules/video_output/svgalib.c
@@ -61,7 +61,7 @@ vlc_module_begin ()
     set_description( N_("SVGAlib video output") )
     set_capability( "video output", 0 )
     set_callbacks( Create, Destroy )
-    linked_with_a_crap_library_which_uses_atexit ()
+    cannot_unload_broken_library () /* SVGAlib uses atexit() */
 vlc_module_end ()
 
 /*****************************************************************************
-- 
2.39.2