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
80170ba7
Commit
80170ba7
authored
May 09, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixups: add missing poll() event flags
parent
62e6b50f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
compat/poll.c
compat/poll.c
+4
-4
include/vlc_fixups.h
include/vlc_fixups.h
+10
-6
No files found.
compat/poll.c
View file @
80170ba7
...
@@ -97,9 +97,9 @@ int (poll) (struct pollfd *fds, unsigned nfds, int timeout)
...
@@ -97,9 +97,9 @@ int (poll) (struct pollfd *fds, unsigned nfds, int timeout)
return
-
1
;
return
-
1
;
}
}
#endif
#endif
if
(
fds
[
i
].
events
&
POLL
IN
)
if
(
fds
[
i
].
events
&
POLL
RDNORM
)
FD_SET
(
fd
,
rdset
);
FD_SET
(
fd
,
rdset
);
if
(
fds
[
i
].
events
&
POLL
OUT
)
if
(
fds
[
i
].
events
&
POLL
WRNORM
)
FD_SET
(
fd
,
wrset
);
FD_SET
(
fd
,
wrset
);
if
(
fds
[
i
].
events
&
POLLPRI
)
if
(
fds
[
i
].
events
&
POLLPRI
)
FD_SET
(
fd
,
exset
);
FD_SET
(
fd
,
exset
);
...
@@ -145,8 +145,8 @@ int (poll) (struct pollfd *fds, unsigned nfds, int timeout)
...
@@ -145,8 +145,8 @@ int (poll) (struct pollfd *fds, unsigned nfds, int timeout)
for
(
unsigned
i
=
0
;
i
<
nfds
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
nfds
;
i
++
)
{
{
int
fd
=
fds
[
i
].
fd
;
int
fd
=
fds
[
i
].
fd
;
fds
[
i
].
revents
=
(
FD_ISSET
(
fd
,
rdset
)
?
POLL
IN
:
0
)
fds
[
i
].
revents
=
(
FD_ISSET
(
fd
,
rdset
)
?
POLL
RDNORM
:
0
)
|
(
FD_ISSET
(
fd
,
wrset
)
?
POLL
OUT
:
0
)
|
(
FD_ISSET
(
fd
,
wrset
)
?
POLL
WRNORM
:
0
)
|
(
FD_ISSET
(
fd
,
exset
)
?
POLLPRI
:
0
);
|
(
FD_ISSET
(
fd
,
exset
)
?
POLLPRI
:
0
);
}
}
#ifdef _WIN32
#ifdef _WIN32
...
...
include/vlc_fixups.h
View file @
80170ba7
...
@@ -273,13 +273,17 @@ const char *inet_ntop(int, const void *, char *, int);
...
@@ -273,13 +273,17 @@ const char *inet_ntop(int, const void *, char *, int);
#ifndef HAVE_STRUCT_POLLFD
#ifndef HAVE_STRUCT_POLLFD
enum
enum
{
{
POLLIN
=
1
,
POLLERR
=
0x1
,
POLLOUT
=
2
,
POLLHUP
=
0x2
,
POLLPRI
=
4
,
POLLNVAL
=
0x4
,
POLLERR
=
8
,
// unsupported stub
POLLWRNORM
=
0x10
,
POLLHUP
=
16
,
// unsupported stub
POLLWRBAND
=
0x20
,
POLLNVAL
=
32
// unsupported stub
POLLRDNORM
=
0x100
,
POLLRDBAND
=
0x200
,
POLLPRI
=
0x400
,
};
};
#define POLLIN (POLLRDNORM|POLLRDBAND)
#define POLLOUT (POLLWRNORM|POLLWRBAND)
struct
pollfd
struct
pollfd
{
{
...
...
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