Extend visibility of winsock definitions when building Cygwin.

diff --git a/w32api/ChangeLog b/w32api/ChangeLog
index 75a8905..28731aa 100644 (file)
--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,19 @@
+2012-07-06  Corinna Vinschen  <corinna@vinschen.de>
+
+       Extend visibility of winsock definitions when building Cygwin.
+
+       * include/winsock.h [__INSIDE_CYGWIN__]: Expose definitions of...
+       (IP_OPTIONS, SO_DEBUG, SO_ACCEPTCONN, SO_REUSEADDR, SO_KEEPALIVE)
+       (SO_DONTROUTE, SO_BROADCAST, SO_USELOOPBACK, SO_LINGER, SO_OOBINLINE)
+       (SO_DONTLINGER, SO_SNDBUF, SO_RCVBUF, SO_SNDLOWAT, SO_RCVLOWAT)
+       (SO_SNDTIMEO, SO_RCVTIMEO, SO_ERROR, SO_TYPE): ...these; however...
+       [__INSIDE_MSYS__]: ...keep them hidden.
+
+       * include/winsock2.h [__INSIDE_CYGWIN__]: Likewise, expose...
+       (AF_MAX, _SS_MAXSIZE, _SS_ALIGNSIZE, _SS_PAD1SIZE, _SS_PAD2SIZE)
+       (struct sockaddr, struct sockaddr_storage): ...these, whereas...
+       [__INSIDE_MSYS__]: ...also keep them hidden.
+
 2012-04-29  Jan Ringos  <tringi@users.sf.net>
 
        Correct version guard for WinXP minimum requirement.

diff --git a/w32api/include/winsock.h b/w32api/include/winsock.h
index 7679aaf..aa6cd18 100644 (file)
--- a/w32api/include/winsock.h
+++ b/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/w32api/include/winsock2.h b/w32api/include/winsock2.h
index eb0ae5e..53316c1 100644 (file)
--- a/w32api/include/winsock2.h
+++ b/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;