eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
pull from: development
merge into: eive:eive/develop
Conversation 0 Commits 1112 Files Changed 1041 +22904 -14405
1036 changed files with 22904 additions and 14405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2714e588d7 - Show all commits

6
src/fsfw/osal/common/TcpIpBase.cpp
View File

@@ -40,8 +40,9 @@ int TcpIpBase::closeSocket(socket_t socket) {
return closesocket(socket); return closesocket(socket);
#elif defined(PLATFORM_UNIX) #elif defined(PLATFORM_UNIX)
return close(socket); return close(socket);
#endif #else
return -1; return -1;
#endif
} }
int TcpIpBase::getLastSocketError() { int TcpIpBase::getLastSocketError() {
@@ -49,6 +50,7 @@ int TcpIpBase::getLastSocketError() {
return WSAGetLastError(); return WSAGetLastError();
#elif defined(PLATFORM_UNIX) #elif defined(PLATFORM_UNIX)
return errno; return errno;
#endif #else
return 0; return 0;
#endif
} }