diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock2.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index e0c2629..bf34a44 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 23 23:41:36 2001 Christopher Faylor <cgf@cygnus.com> + + * include/winsock2.h: Protect some more newlib defines when compiling + cygwin + Mon Apr 23 13:17:32 2001 Christopher Faylor <cgf@cygnus.com> * include/winsock.h: Protect some more newlib defines when compiling diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h index 672f7cd..ac771fc 100644 --- a/winsup/w32api/include/winsock2.h +++ b/winsup/w32api/include/winsock2.h @@ -112,13 +112,13 @@ struct linger { 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 +#endif /* ndef __INSIDE_CYGWIN__ */ #define IOCPARM_MASK 0x7f #define IOC_VOID 0x20000000 #define IOC_OUT 0x40000000 |