diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-12-31 16:07:22 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-12-31 16:07:22 +0300 |
| commit | cf2af34b70169362213576b7e02056eefec3b76b (patch) | |
| tree | 5ebcf75767f5e370234a08026d7e4f0bb51a0c73 | |
| parent | c63bbc11d66e4a2670a6ccd4deb4df4e15608557 (diff) | |
* include/winsock2.h: Don't define struct sockaddr_storage when
building Cygwin.
| -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 f36c98dca..be72bfd50 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2005-12-31 Corinna Vinschen <corinna@vinschen.de> + + * include/winsock2.h: Don't define struct sockaddr_storage when + building Cygwin. + 2005-12-22 Danny Smith <dannysmith@users.sourceforge.net> * lib/ws2_32.c: New file, defining IPv6 constants. diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h index 64016f3ea..2bc8689ce 100644 --- a/winsup/w32api/include/winsock2.h +++ b/winsup/w32api/include/winsock2.h @@ -329,7 +329,6 @@ struct sockaddr { u_short sa_family; char sa_data[14]; }; -#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ /* Portable IPv6/IPv4 version of sockaddr. Uses padding to force 8 byte alignment @@ -340,6 +339,7 @@ struct sockaddr_storage { __int64 __ss_align; /* force alignment */ char __ss_pad2[112]; /* pad to 128 */ }; +#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ struct sockproto { u_short sp_family; |