[netperf-dev] netperf4 commit notice r77 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2006-03-07 13:28:56 -0800 (Tue, 07 Mar 2006)
New Revision: 77

Modified:
   trunk/src/netlib.c
   trunk/src/netperf.c
   trunk/src/netperf.h
   trunk/src/netserver.c
Log:
Some additional baby steps towards Windows.


Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2006-03-07 18:27:19 UTC (rev 76)
+++ trunk/src/netlib.c	2006-03-07 21:28:56 UTC (rev 77)
@@ -105,8 +105,18 @@
 # endif
 #endif
 
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
 
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
 
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif

Modified: trunk/src/netperf.c
===================================================================
--- trunk/src/netperf.c	2006-03-07 18:27:19 UTC (rev 76)
+++ trunk/src/netperf.c	2006-03-07 21:28:56 UTC (rev 77)
@@ -65,6 +65,18 @@
 #include <sys/socket.h>
 #endif
 
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif

Modified: trunk/src/netperf.h
===================================================================
--- trunk/src/netperf.h	2006-03-07 18:27:19 UTC (rev 76)
+++ trunk/src/netperf.h	2006-03-07 21:28:56 UTC (rev 77)
@@ -132,8 +132,8 @@
 #define CHECK_FOR_NOT_SOCKET (WSAGetLastError() == WSAENOTSOCK)
 #define CHECK_FOR_INVALID_SOCKET (temp_socket == INVALID_SOCKET)
 #define CHECK_FOR_RECV_ERROR(len) (len == SOCKET_ERROR)
-#define CHECK_FOR_SEND_ERROR(len) (len >=0) || (len == SOCKET_ERROR && WSAGetLas
-tError() == WSAEINTR)
+#define CHECK_FOR_SEND_ERROR(len) (len >= 0) || \
+        (len == SOCKET_ERROR && WSAGetLastError() == WSAEINTR)
 #define GET_ERRNO WSAGetLastError()
 #define NETPERF_PATH_SEP "\\"
 #else

Modified: trunk/src/netserver.c
===================================================================
--- trunk/src/netserver.c	2006-03-07 18:27:19 UTC (rev 76)
+++ trunk/src/netserver.c	2006-03-07 21:28:56 UTC (rev 77)
@@ -65,6 +65,18 @@
 #include <sys/socket.h>
 #endif
 
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif