[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/network lowlevel.c
From: |
Jimmy Salmon |
Subject: |
[Stratagus-CVS] stratagus/src/network lowlevel.c |
Date: |
Fri, 17 Oct 2003 20:08:48 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/10/17 20:08:48
Modified files:
src/network : lowlevel.c
Log message:
Fixed winsock error checking
Patches:
Index: stratagus/src/network/lowlevel.c
diff -u stratagus/src/network/lowlevel.c:1.37
stratagus/src/network/lowlevel.c:1.38
--- stratagus/src/network/lowlevel.c:1.37 Thu Oct 16 13:03:01 2003
+++ stratagus/src/network/lowlevel.c Fri Oct 17 20:08:47 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: lowlevel.c,v 1.37 2003/10/16 17:03:01 jsalmon3 Exp $
+// $Id: lowlevel.c,v 1.38 2003/10/18 00:08:47 jsalmon3 Exp $
//@{
@@ -299,7 +299,7 @@
sizeof(localAddr), &bytesReturned, NULL, NULL);
if (wsError == SOCKET_ERROR) {
DebugLevel0Fn("SIOCGIFCONF:WSAIoctl(SIO_GET_INTERFACE_LIST) - errno
%ld\n" _C_
- GetLastError());
+ WSA_GetLastError());
}
// parse interface information
@@ -523,7 +523,7 @@
}
memset(&sa, 0, sizeof(sa));
- memcpy(&sa.sin_addr, &addr,sizeof(addr));
+ memcpy(&sa.sin_addr, &addr, sizeof(addr));
sa.sin_family = AF_INET;
sa.sin_port = htons(port);
@@ -562,8 +562,8 @@
// Data available?
retval = select(sockfd + 1, &mask, NULL, NULL, &tv);
-#ifdef _MSC_VER
- } while (retval == SOCKET_ERROR && errno == WSAEINTR);
+#ifdef USE_WINSOCK
+ } while (retval == SOCKET_ERROR && WSAGetLastError() == WSAEINTR);
#else
} while (retval == -1 && errno == EINTR);
#endif
- [Stratagus-CVS] stratagus/src/network lowlevel.c,
Jimmy Salmon <=