projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update or remove references to gettext release.
[gnulib.git]
/
tests
/
test-poll.c
diff --git
a/tests/test-poll.c
b/tests/test-poll.c
index
0dbcb54
..
77b06d9
100644
(file)
--- a/
tests/test-poll.c
+++ b/
tests/test-poll.c
@@
-28,10
+28,15
@@
#include <fcntl.h>
#include <stdlib.h>
#include <stdbool.h>
#include <fcntl.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <sys/ioctl.h>
#include <errno.h>
#include "sockets.h"
#include <errno.h>
#include "sockets.h"
-#ifdef HAVE_IO_H
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WIN32_NATIVE
+#endif
+
+#ifdef WIN32_NATIVE
#include <io.h>
#define pipe(x) _pipe(x, 256, O_BINARY)
#endif
#include <io.h>
#define pipe(x) _pipe(x, 256, O_BINARY)
#endif
@@
-123,28
+128,24
@@
connect_to_socket (int blocking)
if (!blocking)
{
if (!blocking)
{
-#ifdef
__MSVCRT__
+#ifdef
WIN32_NATIVE
unsigned long iMode = 1;
unsigned long iMode = 1;
- ioctl
socket (s, FIONBIO, (void
*) &iMode);
-
+ ioctl
(s, FIONBIO, (char
*) &iMode);
+
#elif defined F_GETFL
int oldflags = fcntl (s, F_GETFL, NULL);
#elif defined F_GETFL
int oldflags = fcntl (s, F_GETFL, NULL);
-
+
if (!(oldflags & O_NONBLOCK))
fcntl (s, F_SETFL, oldflags | O_NONBLOCK);
#endif
}
if (!(oldflags & O_NONBLOCK))
fcntl (s, F_SETFL, oldflags | O_NONBLOCK);
#endif
}
- if (connect (s, (struct sockaddr *) &ia, sizeof (ia)) < 0)
+ if (connect (s, (struct sockaddr *) &ia, sizeof (ia)) < 0
+ && (blocking || errno != EINPROGRESS))
{
{
- if (errno != EINPROGRESS)
- {
- perror ("connect");
- exit (77);
- }
+ perror ("connect");
+ exit (77);
}
}
- else if (!blocking)
- failed ("huh, connect succeeded?");
return s;
}
return s;
}
@@
-161,7
+162,7
@@
poll1 (int fd, int ev, int time)
pfd.fd = fd;
pfd.events = ev;
pfd.revents = 0;
pfd.fd = fd;
pfd.events = ev;
pfd.revents = 0;
- r = poll (&pfd, 1, time);
+ r = poll (&pfd, 1, time);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-241,7
+242,7
@@
test_connect_first (void)
static void
test_accept_first (void)
{
static void
test_accept_first (void)
{
-#ifndef
__MSVCRT__
+#ifndef
WIN32_NATIVE
int s = open_server_socket ();
struct sockaddr_in ia;
socklen_t addrlen;
int s = open_server_socket ();
struct sockaddr_in ia;
socklen_t addrlen;
@@
-359,7
+360,7
@@
main ()
{
int result;
{
int result;
- gl_sockets_startup (SOCKETS_
2_0
);
+ gl_sockets_startup (SOCKETS_
1_1
);
#ifdef INTERACTIVE
printf ("Please press Enter\n");
#ifdef INTERACTIVE
printf ("Please press Enter\n");