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
91571ec6
Commit
91571ec6
authored
Jan 03, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EWOULDBLOCK may be used instead of EAGAIN for read, recv and accept
(cherry picked from commit
aa835660
)
parent
7bf96e77
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
src/network/io.c
src/network/io.c
+3
-0
src/network/tcp.c
src/network/tcp.c
+3
-1
No files found.
src/network/io.c
View file @
91571ec6
...
@@ -375,6 +375,9 @@ __net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
...
@@ -375,6 +375,9 @@ __net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
switch
(
errno
)
switch
(
errno
)
{
{
case
EAGAIN
:
/* spurious wakeup or no TLS data */
case
EAGAIN
:
/* spurious wakeup or no TLS data */
#if (EAGAIN != EWOULDBLOCK)
case
EWOULDBLOCK
:
#endif
case
EINTR
:
/* asynchronous signal */
case
EINTR
:
/* asynchronous signal */
continue
;
continue
;
}
}
...
...
src/network/tcp.c
View file @
91571ec6
...
@@ -52,6 +52,8 @@
...
@@ -52,6 +52,8 @@
#if defined (WIN32) || defined (UNDER_CE)
#if defined (WIN32) || defined (UNDER_CE)
# undef EINPROGRESS
# undef EINPROGRESS
# define EINPROGRESS WSAEWOULDBLOCK
# define EINPROGRESS WSAEWOULDBLOCK
# undef EWOULDBLOCK
# define EWOULDBLOCK WSAEWOULDBLOCK
# undef EINTR
# undef EINTR
# define EINTR WSAEINTR
# define EINTR WSAEINTR
# undef ETIMEDOUT
# undef ETIMEDOUT
...
@@ -256,7 +258,7 @@ int net_AcceptSingle (vlc_object_t *obj, int lfd)
...
@@ -256,7 +258,7 @@ int net_AcceptSingle (vlc_object_t *obj, int lfd)
if
(
fd
==
-
1
)
if
(
fd
==
-
1
)
{
{
if
(
net_errno
!=
EAGAIN
)
if
(
net_errno
!=
EAGAIN
&&
net_errno
!=
EWOULDBLOCK
)
msg_Err
(
obj
,
"accept failed (from socket %d): %m"
,
lfd
);
msg_Err
(
obj
,
"accept failed (from socket %d): %m"
,
lfd
);
return
-
1
;
return
-
1
;
}
}
...
...
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