From ffe28c21d6c8d821faba001131202acea12a276d Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 28 May 1997 16:29:58 +0000
Subject: [PATCH] cygwin32 b18 changes.

---
 src/include/os/cygwin32/osiSock.h    | 21 +--------------------
 src/libCom/osi/os/cygwin32/osdSock.h | 21 +--------------------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/src/include/os/cygwin32/osiSock.h b/src/include/os/cygwin32/osiSock.h
index 117c9090e..d1e07eb34 100644
--- a/src/include/os/cygwin32/osiSock.h
+++ b/src/include/os/cygwin32/osiSock.h
@@ -41,19 +41,6 @@ typedef int                     SOCKET;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE)
 
-/*
- * Windows Sockets errors redefined as regular Berkeley error constants
- */
-#define ETIMEDOUT		WSAETIMEDOUT
-
-/*
- * All Windows Sockets error constants are biased by WSABASEERR from
- * the "normal"
- */
-#define WSABASEERR		10000
-#define WSAETIMEDOUT		(WSABASEERR+60)
-
-
 #define	IOC_OUT		0x40000000	/* copy out parameters */
 #define	IOC_IN		0x80000000	/* copy in parameters */
 #define	IOC_INOUT	(IOC_IN|IOC_OUT)
@@ -73,14 +60,8 @@ typedef int                     SOCKET;
 #define    IFF_POINTOPOINT 0x10
 
 /* Used by ca/iocinf.c  */
+#define SO_SNDBUF          0x1001   /* send buffer size */
 #define SO_RCVBUF          0x1002   /* receive buffer size */
-#define WSAEISCONN         (WSABASEERR+56)
-#define WSAEINPROGRESS     (WSABASEERR+36)
-#define WSAEALREADY        (WSABASEERR+37)
-#define EISCONN            WSAEISCONN
-#define EINPROGRESS        WSAEINPROGRESS
-#define EALREADY           WSAEALREADY
-
 
 #endif /*osiSockH*/
 
diff --git a/src/libCom/osi/os/cygwin32/osdSock.h b/src/libCom/osi/os/cygwin32/osdSock.h
index 117c9090e..d1e07eb34 100644
--- a/src/libCom/osi/os/cygwin32/osdSock.h
+++ b/src/libCom/osi/os/cygwin32/osdSock.h
@@ -41,19 +41,6 @@ typedef int                     SOCKET;
 
 #define FD_IN_FDSET(FD) ((FD)<FD_SETSIZE)
 
-/*
- * Windows Sockets errors redefined as regular Berkeley error constants
- */
-#define ETIMEDOUT		WSAETIMEDOUT
-
-/*
- * All Windows Sockets error constants are biased by WSABASEERR from
- * the "normal"
- */
-#define WSABASEERR		10000
-#define WSAETIMEDOUT		(WSABASEERR+60)
-
-
 #define	IOC_OUT		0x40000000	/* copy out parameters */
 #define	IOC_IN		0x80000000	/* copy in parameters */
 #define	IOC_INOUT	(IOC_IN|IOC_OUT)
@@ -73,14 +60,8 @@ typedef int                     SOCKET;
 #define    IFF_POINTOPOINT 0x10
 
 /* Used by ca/iocinf.c  */
+#define SO_SNDBUF          0x1001   /* send buffer size */
 #define SO_RCVBUF          0x1002   /* receive buffer size */
-#define WSAEISCONN         (WSABASEERR+56)
-#define WSAEINPROGRESS     (WSABASEERR+36)
-#define WSAEALREADY        (WSABASEERR+37)
-#define EISCONN            WSAEISCONN
-#define EINPROGRESS        WSAEINPROGRESS
-#define EALREADY           WSAEALREADY
-
 
 #endif /*osiSockH*/