]> Savannah Git Hosting - gnulib.git/commitdiff
poll: port to MSVC v18 on MS-Windows 8.1
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 25 Feb 2015 00:16:19 +0000 (16:16 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 25 Feb 2015 00:18:26 +0000 (16:18 -0800)
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.

ChangeLog
lib/poll.c
modules/poll

index 2262efad907a74989208a7699f67f5d0cf73f6ef..42351a6831bec88e07c25e21f5cec76f13afeaf1 100644 (file)
--- 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_()
index 12531d92fdc13f3962ac289b9e784c7f98a2b286..69908089ff36a543bbed1ec64f7acbdd3215ca27 100644 (file)
 # 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
index b1d928dd5856587e3f14a60601c563d68df653b8..57f0631e723fbd3ccc9791a5f04a84dbf39c3498 100644 (file)
@@ -12,6 +12,7 @@ assure          [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 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]