commit bf3e2e9fb00eabb118c6b237ca481f7eeba733b3
author James Hatheway <james@macadamian.com> Tue Jul 25 17:45:50 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jul 25 17:45:50 2000 +0000
tree 104b28db2f728199327ee0ddb640dd4514034069
parent 315b00e861a04f36ac7caaae2696c1b0b7412931

Portability fixes.

dlls/winsock/socket.c

diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 4b4e391..3a72fac 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -21,12 +21,9 @@
 #ifdef HAVE_SYS_FILIO_H
 # include <sys/filio.h>
 #endif
-#if defined(__svr4__) || defined(__sun)
-#include <sys/ioccom.h>
 #ifdef HAVE_SYS_SOCKIO_H
 # include <sys/sockio.h>
 #endif
-#endif
 
 #if defined(__EMX__)
 # include <sys/so_ioctl.h>
@@ -1384,11 +1381,28 @@
                }
                else
                {
-                  struct ws_sockaddr_in *ipTemp = (struct ws_sockaddr_in *)&ifInfo.ifr_netmask;
+                  /* Trying to avoid some compile problems across platforms.
+                     (Linux, FreeBSD, Solaris...) */
+                  #ifndef ifr_netmask
+                    #ifndef ifr_addr
+                       intArray->iiNetmask.AddressIn.sin_family = AF_INET; 
+                       intArray->iiNetmask.AddressIn.sin_port = 0;
+                       intArray->iiNetmask.AddressIn.sin_addr.ws_addr = 0; 
+                       ERR ("Unable to determine Netmask on your platform!\n");
+                    #else
+                       struct ws_sockaddr_in *ipTemp = (struct ws_sockaddr_in *)&ifInfo.ifr_addr;
             
-                  intArray->iiNetmask.AddressIn.sin_family = AF_INET; 
-                  intArray->iiNetmask.AddressIn.sin_port = ipTemp->sin_port;
-                  intArray->iiNetmask.AddressIn.sin_addr.ws_addr = ipTemp->sin_addr.S_un.S_addr; 
+                       intArray->iiNetmask.AddressIn.sin_family = AF_INET; 
+                       intArray->iiNetmask.AddressIn.sin_port = ipTemp->sin_port;
+                       intArray->iiNetmask.AddressIn.sin_addr.ws_addr = ipTemp->sin_addr.S_un.S_addr; 
+                    #endif
+                  #else
+                     struct ws_sockaddr_in *ipTemp = (struct ws_sockaddr_in *)&ifInfo.ifr_netmask;
+            
+                     intArray->iiNetmask.AddressIn.sin_family = AF_INET; 
+                     intArray->iiNetmask.AddressIn.sin_port = ipTemp->sin_port;
+                     intArray->iiNetmask.AddressIn.sin_addr.ws_addr = ipTemp->sin_addr.S_un.S_addr; 
+                  #endif
                }
                
                /* Socket Status Flags */