Commit ac7b6acb authored by Felix Paul Kühne's avatar Felix Paul Kühne

core: disabled the deprecated usage of the DYLD API on Darwin for x86_64 builds

This fixes the constant crashes on quit on Leopard
parent 102d36a4
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#if !defined(HAVE_DYNAMIC_PLUGINS) #if !defined(HAVE_DYNAMIC_PLUGINS)
/* no support for plugins */ /* no support for plugins */
#elif defined(HAVE_DL_DYLD) #elif defined(HAVE_DL_DYLD) && !defined(__x86_64__)
# 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
...@@ -98,7 +98,7 @@ int module_Call( vlc_object_t *obj, module_t *p_module ) ...@@ -98,7 +98,7 @@ int module_Call( vlc_object_t *obj, module_t *p_module )
if( pf_symbol == NULL ) if( pf_symbol == NULL )
{ {
#if defined(HAVE_DL_DYLD) || defined(HAVE_DL_BEOS) #if (defined(HAVE_DL_DYLD) && !defined(__x86_64__)) || defined(HAVE_DL_BEOS)
msg_Warn( obj, "cannot find symbol \"%s\" in file `%s'", msg_Warn( obj, "cannot find symbol \"%s\" in file `%s'",
psz_name, p_module->psz_filename ); psz_name, p_module->psz_filename );
#elif defined(HAVE_DL_WINDOWS) #elif defined(HAVE_DL_WINDOWS)
...@@ -145,7 +145,7 @@ int module_Load( vlc_object_t *p_this, const char *psz_file, ...@@ -145,7 +145,7 @@ int module_Load( vlc_object_t *p_this, const char *psz_file,
{ {
module_handle_t handle; module_handle_t handle;
#if defined(HAVE_DL_DYLD) #if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
NSObjectFileImage image; NSObjectFileImage image;
NSObjectFileImageReturnCode ret; NSObjectFileImageReturnCode ret;
...@@ -253,7 +253,7 @@ int module_Load( vlc_object_t *p_this, const char *psz_file, ...@@ -253,7 +253,7 @@ int module_Load( vlc_object_t *p_this, const char *psz_file,
*/ */
void module_Unload( module_handle_t handle ) void module_Unload( module_handle_t handle )
{ {
#if defined(HAVE_DL_DYLD) #if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
NSUnLinkModule( handle, FALSE ); NSUnLinkModule( handle, FALSE );
#elif defined(HAVE_DL_BEOS) #elif defined(HAVE_DL_BEOS)
...@@ -289,7 +289,7 @@ void module_Unload( module_handle_t handle ) ...@@ -289,7 +289,7 @@ void module_Unload( module_handle_t handle )
*/ */
static void *module_Lookup( module_handle_t handle, const char *psz_function ) static void *module_Lookup( module_handle_t handle, const char *psz_function )
{ {
#if defined(HAVE_DL_DYLD) #if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
char psz_call[strlen( psz_function ) + 2]; char psz_call[strlen( psz_function ) + 2];
psz_call[0] = '_'; psz_call[0] = '_';
memcpy( psz_call + 1, psz_function, sizeof( psz_call ) - 1 ); memcpy( psz_call + 1, psz_function, sizeof( psz_call ) - 1 );
......
Markdown is supported
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