Mercurial > hg > octave-jordi > gnulib-hg
changeset 17936:5aeafb603ed9
poll: port to MSVC v18 on MS-Windows 8.1
Problem reported by Gisle Vanem in:
http://lists.gnu.org/archive/html/bug-gnulib/2015-02/msg00139.html
* lib/poll.c: Always include <sys/select.h> and <sys/socket.h>.
* modules/poll (Depends-on) [!HAVE_POLL || REPLACE_POLL]:
Add sys_socket.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 24 Feb 2015 16:16:19 -0800 |
| parents | 0ad1f4c9eed5 |
| children | 34065aa26b62 |
| files | ChangeLog lib/poll.c modules/poll |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-02-24 Paul Eggert <eggert@cs.ucla.edu> + + poll: port to MSVC v18 on MS-Windows 8.1 + Problem reported by Gisle Vanem in: + http://lists.gnu.org/archive/html/bug-gnulib/2015-02/msg00139.html + * lib/poll.c: Always include <sys/select.h> and <sys/socket.h>. + * modules/poll (Depends-on) [!HAVE_POLL || REPLACE_POLL]: + Add sys_socket. + 2015-02-24 Pádraig Brady <P@draigBrady.com> tests: support stderr verification with returns_()
--- a/lib/poll.c +++ b/lib/poll.c @@ -44,11 +44,12 @@ # include "msvc-nothrow.h" #else # include <sys/time.h> -# include <sys/socket.h> -# include <sys/select.h> # include <unistd.h> #endif +#include <sys/select.h> +#include <sys/socket.h> + #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif
--- a/modules/poll +++ b/modules/poll @@ -12,6 +12,7 @@ select [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1] sockets [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1] sys_select [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1] +sys_socket [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1] sys_time [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1] errno [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1] msvc-nothrow [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]