Mercurial > hg > octave-nkf > gnulib-hg
changeset 11416:1b59f3d3ede6
Make sockets.h self-contained.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Fri, 20 Mar 2009 15:22:56 +0100 |
parents | 986e096a5695 |
children | 8f6a9e833c33 |
files | ChangeLog lib/sockets.c lib/sockets.h |
diffstat | 3 files changed, 18 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-03-20 Bruno Haible <bruno@clisp.org> + + Make sockets.h self-contained. + * lib/sockets.c: Include sockets.h first. + * lib/sockets.h: Include <sys/socket.h> before using the SOCKET type. + 2009-03-19 Eric Blake <ebb9@byu.net> doc: mention more functions added in cygwin 1.7.0
--- a/lib/sockets.c +++ b/lib/sockets.c @@ -1,6 +1,6 @@ /* sockets.c --- wrappers for Windows socket functions - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,11 +19,12 @@ #include <config.h> +/* Specification. */ +#include "sockets.h" + /* This includes winsock2.h on MinGW. */ #include <sys/socket.h> -#include "sockets.h" - int gl_sockets_startup (int version) {
--- a/lib/sockets.h +++ b/lib/sockets.h @@ -33,13 +33,19 @@ Winsock wrappers but needs to pass on the socket handle to some other library that only accepts sockets. */ #if WINDOWS_SOCKETS + +#include <sys/socket.h> + static inline SOCKET gl_fd_to_handle (int fd) { return _get_osfhandle (fd); } + #else + #define gl_fd_to_handle(x) (x) -#endif -#endif +#endif /* WINDOWS_SOCKETS */ + +#endif /* SOCKETS_H */