[vlc-devel] commit: Revert "modules: added a hack to work-around the buggy 64bit runtime on OS X Leopard" ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug  1 23:05:38 2009 +0300| [fe96218b13c7b82ed45a138f1f2aae05630bdf76] | committer: Rémi Denis-Courmont 

Revert "modules: added a hack to work-around the buggy 64bit runtime on OS X Leopard"

This reverts commit 7147338b7439f7f4a5d6d9c86e8d5d7a8501be4d.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fe96218b13c7b82ed45a138f1f2aae05630bdf76
---

 configure.ac          |    4 ++--
 src/modules/modules.c |    5 +----
 src/modules/modules.h |    3 ++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index d04f9e6..ff461fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -794,8 +794,8 @@ if test "${ac_cv_have_plugins}" = "no"; then
     ac_cv_have_plugins=yes])
 fi
 
-# Only test for dlopen() if the others didn't work or on Darwin for 64bit builds
-if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
+# Only test for dlopen() if the others didn't work
+if test "${ac_cv_have_plugins}" = "no"; then
   AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
   ac_cv_my_have_dlopen=no
   AC_CHECK_FUNC(dlopen,
diff --git a/src/modules/modules.c b/src/modules/modules.c
index 3766876..c69cf70 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -1396,10 +1396,7 @@ static void DeleteModule( module_bank_t *p_bank, module_t * p_module )
     {
         if( p_module->b_loaded && p_module->b_unloadable )
         {
-            #if defined( __APPLE__ ) && defined ( __x86_64__ )
-                if( strcmp( p_module->psz_object_name, "macosx" ) )
-            #endif
-                module_Unload( p_module->handle );
+            module_Unload( p_module->handle );
         }
         UndupModule( p_module );
         free( p_module->psz_filename );
diff --git a/src/modules/modules.h b/src/modules/modules.h
index a1955f4..00836dd 100644
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -28,6 +28,7 @@
 #ifndef __LIBVLC_MODULES_H
 # define __LIBVLC_MODULES_H 1
 
+
 /* Number of tries before we unload an unused module */
 #define MODULE_HIDE_DELAY 50
 
@@ -75,7 +76,7 @@ struct module_cache_t
 #define MODULE_SHORTCUT_MAX 50
 
 /* The module handle type. */
-#if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
+#if defined(HAVE_DL_DYLD)
 #   if defined (HAVE_MACH_O_DYLD_H)
 #       include <mach-o/dyld.h>
 #   endif