diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-07-06 13:52:10 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-07-06 13:52:10 +0000 |
| commit | dc45bfa0bf7fcb36a00388a629b56ea8e5fabda3 (patch) | |
| tree | 7a0c1a9b3ef379fdef311675e2b7331b17a9dc71 | |
| parent | f3a43e7ef07cbdb303685452fccd56f6953a8bd0 (diff) | |
| download | cygnal-dc45bfa0bf7fcb36a00388a629b56ea8e5fabda3.tar.gz cygnal-dc45bfa0bf7fcb36a00388a629b56ea8e5fabda3.tar.bz2 cygnal-dc45bfa0bf7fcb36a00388a629b56ea8e5fabda3.zip | |
* include/winsock.h: Keep IP_OPTIONS and SO_xxx definitions when
building Cygwin.
* include/winsock2.h: Keep sockaddr and sockaddr_storage definitions
when building Cygwin.
| -rw-r--r-- | winsup/w32api/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winsock2.h | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 60fcacd00..d5b6772d9 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2012-07-06 Corinna Vinschen <corinna@vinschen.de> + + * include/winsock.h: Keep IP_OPTIONS and SO_xxx definitions when + building Cygwin. + * include/winsock2.h: Keep sockaddr and sockaddr_storage definitions + when building Cygwin. + 2012-04-29 Jan Ringos <tringi@users.sf.net> * include/winbase.h (GetModuleHandleEx[A/W]): Correct version guard. diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h index b595b597c..929c10348 100644 --- a/winsup/w32api/include/winsock.h +++ b/winsup/w32api/include/winsock.h @@ -240,7 +240,7 @@ typedef struct WSAData { } WSADATA; typedef WSADATA *LPWSADATA; -#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) +#ifndef __INSIDE_MSYS__ #define IP_OPTIONS 1 #define SO_DEBUG 1 #define SO_ACCEPTCONN 2 @@ -260,7 +260,7 @@ typedef WSADATA *LPWSADATA; #define SO_RCVTIMEO 0x1006 #define SO_ERROR 0x1007 #define SO_TYPE 0x1008 -#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ +#endif /* !__INSIDE_MSYS__ */ /* * Note that the next 5 IP defines are specific to WinSock 1.1 (wsock32.dll). * They will cause errors or unexpected results if used with the diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h index 260c3fa5f..0279227b4 100644 --- a/winsup/w32api/include/winsock2.h +++ b/winsup/w32api/include/winsock2.h @@ -331,7 +331,7 @@ typedef WSADATA *LPWSADATA; #define AF_12844 25 #define AF_IRDA 26 #define AF_NETDES 28 -#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) +#ifndef __INSIDE_MSYS__ #define AF_MAX 29 struct sockaddr { u_short sa_family; @@ -359,7 +359,7 @@ struct sockaddr_storage { __int64 __ss_align; /* force alignment */ char __ss_pad2[_SS_PAD2SIZE]; /* pad to 128 */ }; -#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ +#endif /* !__INSIDE_MSYS__ */ struct sockproto { u_short sp_family; |