plibc: win32 related, socket

diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c
index 3bb08c0e88cae40cdedaecb7cb32d25fe83cc8c7..f1821a17bf7a340fbd1ab00db7920312773c3efa 100644 (file)
--- a/src/transport/tcp_service_legacy.c
+++ b/src/transport/tcp_service_legacy.c
@@ -895,7 +895,7 @@ receive_sockets_from_parent(struct LEGACY_SERVICE_Context *sctx)
         {
           WSAPROTOCOL_INFOA pi;
           uint64_t size;
-          SOCKET s;
+          socket s;
 
           ret = ReadFile(lsocks_pipe, &size, sizeof(size), &rd, NULL);
           if ((0 == ret) || (sizeof(size) != rd) || (sizeof(pi) != size))

diff --git a/src/util/network.c b/src/util/network.c
index 9eff6b96ef3b9a798b5b69ef3a9388d7ca5b8c43..7a1d27f0e6709061d4fd604f3b3e418975fd7065 100644 (file)
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -47,7 +47,7 @@ struct GNUNET_NETWORK_Handle {
 #ifndef MINGW
   int fd;
 #else
-  SOCKET fd;
+  _win_socket fd;
 #endif
 
   /**
@@ -1608,7 +1608,7 @@ struct _select_params {
   /**
    * FIXME.
    */
-  SOCKET wakeup_socket;
+  _win_socket wakeup_socket;
 
   /**
    * Set to return value from select.
@@ -1660,9 +1660,9 @@ static HANDLE select_finished_event;
 
 static HANDLE select_standby_event;
 
-static SOCKET select_wakeup_socket = -1;
+static _win_socket select_wakeup_socket = -1;
 
-static SOCKET select_send_socket = -1;
+static _win_socket select_send_socket = -1;
 
 static struct timeval select_timeout;
 
@@ -1675,7 +1675,7 @@ static struct timeval select_timeout;
 static void
 initialize_select_thread()
 {
-  SOCKET select_listening_socket = -1;
+  _win_socket select_listening_socket = -1;
   struct sockaddr_in s_in;
   int alen;
   int res;

diff --git a/src/util/service.c b/src/util/service.c
index 089d3ef35c8f8e4fb5e18408d48f41107bea6a37..75094e0281261c5d96837d3668c86d57df02a264 100644 (file)
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1400,7 +1400,7 @@ receive_sockets_from_parent(struct GNUNET_SERVICE_Handle *sh)
         {
           WSAPROTOCOL_INFOA pi;
           uint64_t size;
-          SOCKET s;
+          _win_socket s;
 
           ret = ReadFile(lsocks_pipe, &size, sizeof(size), &rd, NULL);
           if ((0 == ret) || (sizeof(size) != rd) || (sizeof(pi) != size))

diff --git a/src/util/win.c b/src/util/win.c
index 39b276a6c5c19a6cf8c1cd6c359fbfd7ab01ab2d..a2b0d08daa78ad9b3f688d0b539ccce7b40cb843 100644 (file)
--- a/src/util/win.c
+++ b/src/util/win.c
@@ -218,7 +218,7 @@ _IP_ADAPTER_ADDRESSES_DEFINE(_VISTA, _IP_ADAPTER_ADDRESSES_ADD_VISTA)
 _IP_ADAPTER_ADDRESSES_DEFINE(_2008_OR_VISTASP1, _IP_ADAPTER_ADDRESSES_ADD_2008_OR_VISTASP1)
 
 static int
-EnumNICs_IPv6_get_ifs_count(SOCKET s)
+EnumNICs_IPv6_get_ifs_count(_win_socket s)
 {
   DWORD dwret = 0, err;
   int iret;
@@ -234,7 +234,7 @@ EnumNICs_IPv6_get_ifs_count(SOCKET s)
 }
 
 static int
-EnumNICs_IPv6_get_ifs(SOCKET s, SOCKET_ADDRESS_LIST *inf, int size)
+EnumNICs_IPv6_get_ifs(_win_socket s, SOCKET_ADDRESS_LIST *inf, int size)
 {
   int iret;
   DWORD dwret = 0;
@@ -303,8 +303,8 @@ int
 EnumNICs2(INTERFACE_INFO **ifs4, int *ifs4_len, SOCKET_ADDRESS_LIST **ifs6)
 {
   int result = 0;
-  SOCKET s4;
-  SOCKET s6;
+  _win_socket s4;
+  _win_socket s6;
   int ifs4len = 0;
   int ifs6len = 0;
   INTERFACE_INFO *interfaces4 = NULL;