repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'warped-rudi/cubox-stable' into development. Closes #50
[deb_libcec.git]
/
src
/
lib
/
platform
/
posix
/
os-socket.h
diff --git
a/src/lib/platform/posix/os-socket.h
b/src/lib/platform/posix/os-socket.h
index 9d98d9ad9285f3646046597b9ef1a71bc35f08d9..739c6a71823d76ee002f306fb11888325775010e 100644
(file)
--- a/
src/lib/platform/posix/os-socket.h
+++ b/
src/lib/platform/posix/os-socket.h
@@
-87,7
+87,7
@@
namespace PLATFORM
{
FD_ZERO(&port);
FD_SET(socket, &port);
{
FD_ZERO(&port);
FD_SET(socket, &port);
-
int returnv =
select(socket + 1, NULL, &port, NULL, tv);
+
ssize_t returnv = (ssize_t)
select(socket + 1, NULL, &port, NULL, tv);
if (returnv < 0)
{
*iError = errno;
if (returnv < 0)
{
*iError = errno;
@@
-146,7
+146,7
@@
namespace PLATFORM
FD_ZERO(&port);
FD_SET(socket, &port);
FD_ZERO(&port);
FD_SET(socket, &port);
-
int32_t returnv =
select(socket + 1, &port, NULL, NULL, tv);
+
ssize_t returnv = (ssize_t)
select(socket + 1, &port, NULL, NULL, tv);
if (returnv == -1)
{
if (returnv == -1)
{
@@
-243,7
+243,7
@@
namespace PLATFORM
{
if (iTimeoutMs > 0)
{
{
if (iTimeoutMs > 0)
{
- int iPollResult = poll(&fds, 1,
iTarget - iNow
);
+ int iPollResult = poll(&fds, 1,
(int)(iTarget - iNow)
);
if (iPollResult == 0)
{
*iError = ETIMEDOUT;
if (iPollResult == 0)
{
*iError = ETIMEDOUT;
@@
-320,7
+320,7
@@
namespace PLATFORM
pfd.events = POLLOUT;
pfd.revents = 0;
pfd.events = POLLOUT;
pfd.revents = 0;
- int iPollResult = poll(&pfd, 1, iTimeout);
+ int iPollResult = poll(&pfd, 1,
(int)
iTimeout);
if (iPollResult == 0)
*iError = ETIMEDOUT;
else if (iPollResult == -1)
if (iPollResult == 0)
*iError = ETIMEDOUT;
else if (iPollResult == -1)