JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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.
This commit is contained in:
Corinna Vinschen 2012-07-06 13:52:10 +00:00
parent f3a43e7ef0
commit dc45bfa0bf
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/w32api/ChangeLog
View File

@ -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> 2012-04-29 Jan Ringos <tringi@users.sf.net>
* include/winbase.h (GetModuleHandleEx[A/W]): Correct version guard. * include/winbase.h (GetModuleHandleEx[A/W]): Correct version guard.

4
winsup/w32api/include/winsock.h
View File

@ -240,7 +240,7 @@ typedef struct WSAData {
} WSADATA; } WSADATA;
typedef WSADATA *LPWSADATA; typedef WSADATA *LPWSADATA;
#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #ifndef __INSIDE_MSYS__
#define IP_OPTIONS 1 #define IP_OPTIONS 1
#define SO_DEBUG 1 #define SO_DEBUG 1
#define SO_ACCEPTCONN 2 #define SO_ACCEPTCONN 2
@ -260,7 +260,7 @@ typedef WSADATA *LPWSADATA;
#define SO_RCVTIMEO 0x1006 #define SO_RCVTIMEO 0x1006
#define SO_ERROR 0x1007 #define SO_ERROR 0x1007
#define SO_TYPE 0x1008 #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). * 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 * They will cause errors or unexpected results if used with the

4
winsup/w32api/include/winsock2.h
View File

@ -331,7 +331,7 @@ typedef WSADATA *LPWSADATA;
#define AF_12844 25 #define AF_12844 25
#define AF_IRDA 26 #define AF_IRDA 26
#define AF_NETDES 28 #define AF_NETDES 28
#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #ifndef __INSIDE_MSYS__
#define AF_MAX 29 #define AF_MAX 29
struct sockaddr { struct sockaddr {
u_short sa_family; u_short sa_family;
@ -359,7 +359,7 @@ struct sockaddr_storage {
__int64 __ss_align; /* force alignment */ __int64 __ss_align; /* force alignment */
char __ss_pad2[_SS_PAD2SIZE]; /* pad to 128 */ char __ss_pad2[_SS_PAD2SIZE]; /* pad to 128 */
}; };
#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ #endif /* !__INSIDE_MSYS__ */
struct sockproto { struct sockproto {
u_short sp_family; u_short sp_family;