Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
7147338b
Commit
7147338b
authored
Aug 01, 2009
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modules: added a hack to work-around the buggy 64bit runtime on OS X Leopard
parent
edab4ee0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
configure.ac
configure.ac
+2
-2
src/modules/modules.c
src/modules/modules.c
+4
-1
src/modules/modules.h
src/modules/modules.h
+1
-2
No files found.
configure.ac
View file @
7147338b
...
@@ -794,8 +794,8 @@ if test "${ac_cv_have_plugins}" = "no"; then
...
@@ -794,8 +794,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
# Only test for dlopen() if the others didn't work
or on Darwin for 64bit builds
if test "${ac_cv_have_plugins}" = "no"; then
if test "${ac_cv_have_plugins}" = "no"
-o "${SYS}" = "darwin"
; 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,
...
...
src/modules/modules.c
View file @
7147338b
...
@@ -1396,6 +1396,9 @@ static void DeleteModule( module_bank_t *p_bank, module_t * p_module )
...
@@ -1396,6 +1396,9 @@ 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__ )
if
(
strcmp
(
p_module
->
psz_object_name
,
"macosx"
)
)
#endif
module_Unload
(
p_module
->
handle
);
module_Unload
(
p_module
->
handle
);
}
}
UndupModule
(
p_module
);
UndupModule
(
p_module
);
...
...
src/modules/modules.h
View file @
7147338b
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
#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
...
@@ -76,7 +75,7 @@ struct module_cache_t
...
@@ -76,7 +75,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)
#if 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment