Skip to content
Browse files

Merge pull request #67 from Memphiz/master

fix compilation on ios/osx
  • Loading branch information...
2 parents 8fc9b12 + 1527fc0 commit 043258fcc694781e523273afcbff304aa02473ac @theuni theuni committed Oct 16, 2012
Showing with 9 additions and 9 deletions.
  1. +3 −3 addons/pvr.nextpvr/src/Socket.cpp
  2. +6 −6 addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp
View
6 addons/pvr.nextpvr/src/Socket.cpp
@@ -440,11 +440,11 @@ int Socket::receive ( char* data, const unsigned int buffersize, const unsigned
if ( status == SOCKET_ERROR )
{
int lasterror = getLastError();
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
- if ( lasterror != EAGAIN && lasterror != EWOULDBLOCK )
+#if defined(TARGET_WINDOWS)
+ if ( lasterror != WSAEWOULDBLOCK)
errormessage( lasterror, "Socket::receive" );
#else
- if ( lasterror != WSAEWOULDBLOCK)
+ if ( lasterror != EAGAIN && lasterror != EWOULDBLOCK )
errormessage( lasterror, "Socket::receive" );
#endif
return status;
View
12 addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp
@@ -1144,10 +1144,10 @@ int cPVRClientNextPVR::ReadLiveStream(unsigned char *pBuffer, unsigned int iBuff
}
else
{
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
- usleep(5000);
-#else
+#if defined(TARGET_WINDOWS)
Sleep(5);
+#else
+ usleep(5000);
#endif
}
}
@@ -1530,10 +1530,10 @@ int cPVRClientNextPVR::DoRequest(const char *resource, CStdString &response)
}
else
{
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
- usleep(50000);
-#else
+#if defined(TARGET_WINDOWS)
Sleep(50);
+#else
+ usleep(50000);
#endif
delayed += 50;
}

0 comments on commit 043258f

Please sign in to comment.
Something went wrong with that request. Please try again.