diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 245a475e3..e0c26296d 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,7 @@ +Mon Apr 23 13:17:32 2001 Christopher Faylor <cgf@cygnus.com> + + * include/winsock.h: Protect some more newlib defines when compiling + cygwin. 2001-04-17 Egor Duda <deo@logos-m.ru> diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h index 0eb5a52ee..950dbc295 100644 --- a/winsup/w32api/include/winsock.h +++ b/winsup/w32api/include/winsock.h @@ -95,13 +95,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 |