[PATCH] Increase Cygwin protection in winsock.h

Christopher Faylor cgf@redhat.com
Mon Apr 23 10:20:00 GMT 2001


Mon Apr 23 13:17:32 2001  Christopher Faylor <cgf@cygnus.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



More information about the Cygwin-developers mailing list