Commit 40fd31c1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

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

This reverts commit 75b34a6c.
parent 75b34a6c
...@@ -790,8 +790,8 @@ if test "${ac_cv_have_plugins}" = "no"; then ...@@ -790,8 +790,8 @@ if test "${ac_cv_have_plugins}" = "no"; then
ac_cv_have_plugins=yes]) ac_cv_have_plugins=yes])
fi fi
# Only test for dlopen() if the others didn't work or on Darwin for 64bit builds # Only test for dlopen() if the others didn't work
if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then if test "${ac_cv_have_plugins}" = "no"; then
AC_CHECK_HEADERS(dlfcn.h sys/dl.h) AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
ac_cv_my_have_dlopen=no ac_cv_my_have_dlopen=no
AC_CHECK_FUNC(dlopen, AC_CHECK_FUNC(dlopen,
......
...@@ -1395,10 +1395,7 @@ static void DeleteModule( module_bank_t *p_bank, module_t * p_module ) ...@@ -1395,10 +1395,7 @@ static void DeleteModule( module_bank_t *p_bank, module_t * p_module )
{ {
if( p_module->b_loaded && p_module->b_unloadable ) if( p_module->b_loaded && p_module->b_unloadable )
{ {
#if defined( __APPLE__ ) && defined ( __x86_64__ ) module_Unload( p_module->handle );
if( strcmp( p_module->psz_object_name, "macosx" ) )
#endif
module_Unload( p_module->handle );
} }
UndupModule( p_module ); UndupModule( p_module );
free( p_module->psz_filename ); free( p_module->psz_filename );
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#ifndef __LIBVLC_MODULES_H #ifndef __LIBVLC_MODULES_H
# define __LIBVLC_MODULES_H 1 # define __LIBVLC_MODULES_H 1
/* Number of tries before we unload an unused module */ /* Number of tries before we unload an unused module */
#define MODULE_HIDE_DELAY 50 #define MODULE_HIDE_DELAY 50
...@@ -75,7 +76,7 @@ struct module_cache_t ...@@ -75,7 +76,7 @@ struct module_cache_t
#define MODULE_SHORTCUT_MAX 50 #define MODULE_SHORTCUT_MAX 50
/* The module handle type. */ /* The module handle type. */
#if defined(HAVE_DL_DYLD) && !defined(__x86_64__) #if defined(HAVE_DL_DYLD)
# if defined (HAVE_MACH_O_DYLD_H) # if defined (HAVE_MACH_O_DYLD_H)
# include <mach-o/dyld.h> # include <mach-o/dyld.h>
# endif # endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment