Mailing-List: contact cygwin-developers-help AT sourceware DOT cygnus DOT com; run by ezmlm
List-Subscribe: <mailto:cygwin-developers-subscribe AT sources DOT redhat DOT com>
List-Archive: <http://sources.redhat.com/ml/cygwin-developers/>
List-Post: <mailto:cygwin-developers AT sources DOT redhat DOT com>
List-Help: <mailto:cygwin-developers-help AT sources DOT redhat DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender: cygwin-developers-owner AT sources DOT redhat DOT com
Delivered-To: mailing list cygwin-developers AT sources DOT redhat DOT com
Date: Mon, 23 Apr 2001 13:20:43 -0400
From: Christopher Faylor <cgf AT redhat DOT com>
To: cygwin-developers AT cygwin DOT com
Subject: [PATCH] Increase Cygwin protection in winsock.h
Message-ID: <20010423132043.A21076@redhat.com>
Reply-To: cygwin-developers AT cygwin DOT com
Mail-Followup-To: cygwin-developers AT cygwin DOT com
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.11i

Mon Apr 23 13:17:32 2001  Christopher Faylor <cgf AT cygnus DOT com>
 
 	* include/winsock.h: Protect some more newlib defines when compiling
 	cygwin.
  
Index: include/winsock.h
===================================================================
RCS file: /cvs/uberbaum/winsup/w32api/include/winsock.h,v
retrieving revision 1.6
diff -p -r1.6 winsock.h
*** winsock.h	2001/03/20 19:27:37	1.6
--- winsock.h	2001/04/23 17:17:55
*************** struct linger {
*** 95,107 ****
  	u_short l_onoff;
  	u_short l_linger;
  };
- #endif /* ndef __INSIDE_CYGWIN__ */
  #define timerisset(tvp)	 ((tvp)->tv_sec || (tvp)->tv_usec)
  #define timercmp(tvp, uvp, cmp) \
  	(((tvp)->tv_sec != (uvp)->tv_sec) ? \
  	((tvp)->tv_sec cmp (uvp)->tv_sec) : \
  	((tvp)->tv_usec cmp (uvp)->tv_usec))
  #define timerclear(tvp)	 (tvp)->tv_sec = (tvp)->tv_usec = 0
  #define IOCPARM_MASK	0x7f
  #define IOC_VOID	0x20000000
  #define IOC_OUT	0x40000000
--- 95,107 ----
  	u_short l_onoff;
  	u_short l_linger;
  };
  #define timerisset(tvp)	 ((tvp)->tv_sec || (tvp)->tv_usec)
  #define timercmp(tvp, uvp, cmp) \
  	(((tvp)->tv_sec != (uvp)->tv_sec) ? \
  	((tvp)->tv_sec cmp (uvp)->tv_sec) : \
  	((tvp)->tv_usec cmp (uvp)->tv_usec))
  #define timerclear(tvp)	 (tvp)->tv_sec = (tvp)->tv_usec = 0
+ #endif /* ndef __INSIDE_CYGWIN__ */
  #define IOCPARM_MASK	0x7f
  #define IOC_VOID	0x20000000
  #define IOC_OUT	0x40000000