Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
b56716cf
Commit
b56716cf
authored
Sep 10, 2007
by
damienf
Browse files
smb.c: prevents problem with glibc defining open as a macro
parent
e316387a
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/access/smb.c
View file @
b56716cf
...
...
@@ -226,7 +226,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_EGENERIC
;
}
if
(
!
(
p_file
=
p_smb
->
open
(
p_smb
,
psz_uri
,
O_RDONLY
,
0
))
)
if
(
!
(
p_file
=
(
p_smb
->
open
)
(
p_smb
,
psz_uri
,
O_RDONLY
,
0
))
)
{
msg_Err
(
p_access
,
"open failed for '%s' (%s)"
,
p_access
->
psz_path
,
strerror
(
errno
)
);
...
...
@@ -251,6 +251,14 @@ static int Open( vlc_object_t *p_this )
}
#endif
/*
** some version of glibc defines open as a macro, causing havoc
** with other macros using 'open' under the hood, such as the
** following one:
*/
#if defined(smbc_open) && defined(open)
# undef open
#endif
if
(
(
i_smb
=
smbc_open
(
psz_uri
,
O_RDONLY
,
0
))
<
0
)
{
msg_Err
(
p_access
,
"open failed for '%s' (%s)"
,
...
...
Write
Preview
Supports
Markdown
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