diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-07-06 13:52:19 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-07-06 13:52:19 +0000 |
| commit | db80f635c109c7b7d7ef4b96d6c7ebbd8a4429ba (patch) | |
| tree | 7ff0f9525a2c366fd03956e046c6c5f9e1ddb4d9 /winsup/cygwin/fhandler_procnet.cc | |
| parent | dc45bfa0bf7fcb36a00388a629b56ea8e5fabda3 (diff) | |
| download | newlib-db80f635c109c7b7d7ef4b96d6c7ebbd8a4429ba.zip newlib-db80f635c109c7b7d7ef4b96d6c7ebbd8a4429ba.tar.gz newlib-db80f635c109c7b7d7ef4b96d6c7ebbd8a4429ba.tar.bz2 | |
In terms of network related functionality, rely on Winsock definitions
as much as possible:
* dtable.cc: Drop including sys/socket.h.
* fhandler_procnet.cc: Change includes accordingly.
* fhandler_socket.cc: Ditto.
(fhandler_socket::listen): Avoid gcc error message initializing sin6.
(LPFN_WSARECVMSG): Only define when building against w32api headers.
* net.cc: Change includes accordingly. Define USE_SYS_TYPES_FD_SET
and __WSA_ERR_MACROS_DEFINED. Define _INC_NETIOAPI temporarily and
explain why.
(struct _IP_ADAPTER_UNICAST_ADDRESS_LH): Only define when building
against w32api headers.
(struct _IP_ADAPTER_ADDRESSES_LH): Ditto.
(SIO_GET_INTERFACE_LIST): Ditto.
(ws_freeaddrinfo): Rename from freeaddrinfo so as not to collide with
Winsock declaration. Change througout.
(ws_getaddrinfo): Ditto.
(ws_getnameinfo): Ditto.
* select.cc: Include netdb.h after defining USE_SYS_TYPES_FD_SET.
* syslog.cc: Drop including netinet/in.h. Define USE_SYS_TYPES_FD_SET
and include ws2tcpip.h.
* include/netdb.h (struct addrinfo): Don't define when building Cygwin.
* include/cygwin/if.h: Don't declare if_xxx functions when building
Cygwin.
* include/cygwin/in.h: Disable most definitions when building Cygwin.
* include/cygwin/socket.h: Disable sockaddr and sockaddr_storage
definitions when building Cygwin. Same for MCAST_INCLUDE/MCAST_EXCLUDE.
* libc/inet_addr.c: Don't define __INSIDE_CYGWIN__ nor
__INSIDE_CYGWIN_NET__.
* libc/inet_network.c: Ditto.
* libc/minires.h: Drop redundant inclusion of netdb.h. Define
__INSIDE_CYGWIN_NET__ only before including netdb.h and resolver
headers.
Diffstat (limited to 'winsup/cygwin/fhandler_procnet.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_procnet.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/winsup/cygwin/fhandler_procnet.cc b/winsup/cygwin/fhandler_procnet.cc index 836bf33..9e9635b 100644 --- a/winsup/cygwin/fhandler_procnet.cc +++ b/winsup/cygwin/fhandler_procnet.cc @@ -9,7 +9,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #define __INSIDE_CYGWIN_NET__ - +#define USE_SYS_TYPES_FD_SET #include "winsup.h" #include "cygerrno.h" #include "security.h" @@ -18,13 +18,9 @@ details. */ #include "fhandler_virtual.h" #include "dtable.h" #include "cygheap.h" - -#include <netdb.h> -#define USE_SYS_TYPES_FD_SET -#include <winsock2.h> +#include <ws2tcpip.h> #include <iphlpapi.h> #include <asm/byteorder.h> -#include <cygwin/in6.h> #define _COMPILING_NEWLIB #include <dirent.h> |