diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-03-24 14:03:40 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-03-24 15:55:25 +0100 |
| commit | b1b46d458091646187775f594e6f4fa733fb7094 (patch) | |
| tree | 257b686b5e3893798b9cfe270af1358d6f7b295e /winsup/cygwin/fhandler_socket.cc | |
| parent | db5bfdbd8ab2729a95c95638fbcc1db8cbfef162 (diff) | |
| download | cygnal-b1b46d458091646187775f594e6f4fa733fb7094.tar.gz cygnal-b1b46d458091646187775f594e6f4fa733fb7094.tar.bz2 cygnal-b1b46d458091646187775f594e6f4fa733fb7094.zip | |
Drop usage of old-age BSD types in generically used Cygwin headers
u_char, u_short, u_int, u_long are BSD-only types. Remove them from
Cygwin headers which are supposed to be used in a non-BSD scenario.
Drop special Cygwin handling of those types in sys/types.h.
newlib:
* libc/include/sys/types.h (u_char,u_short,u_int,u_long): Drop
Cygwin exception.
cygwin:
* fhandler_socket.cc (fhandler_socket::ioctl): Accommodate change
in include/asm/socket.h. Continue using u_long since that's the
MS type here.
* include/asm/socket.h: Since the type given in _IOR/_IOW macros
is only used for its sizeof, replace u_long with equivalent long.
* netdb.h (getnetbyaddr): Fix prototype.
* netinet/ip.h: Replace old BSD-only types with generically defined
old BSD types (u_char -> u_int8_t, etc).
* netinet/tcp.h: Ditto.
* netinet/udp.h: Ditto.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/fhandler_socket.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index e71954321..27c2989cc 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -2248,7 +2248,7 @@ fhandler_socket::ioctl (unsigned int cmd, void *p) use a type of the expected size. Hopefully. */ case FIOASYNC: #ifdef __x86_64__ - case _IOW('f', 125, unsigned long): + case _IOW('f', 125, u_long): #endif res = WSAAsyncSelect (get_socket (), winmsg, WM_ASYNCIO, *(int *) p ? ASYNC_MASK : 0); @@ -2261,7 +2261,7 @@ fhandler_socket::ioctl (unsigned int cmd, void *p) break; case FIONREAD: #ifdef __x86_64__ - case _IOR('f', 127, unsigned long): + case _IOR('f', 127, u_long): #endif res = ioctlsocket (get_socket (), FIONREAD, (u_long *) p); if (res == SOCKET_ERROR) |