summaryrefslogtreecommitdiff
path: root/ev.c
diff options
context:
space:
mode:
authorroot <root>2007-11-06 16:27:10 +0000
committerroot <root>2007-11-06 16:27:10 +0000
commite7d1fc1a4bbd47e0d2f7d59d1ce4ccaa4fa0ab10 (patch)
tree7cc41f6c722e36d70b91e35fc29a37e2919363d2 /ev.c
parent36718ee47b617f9eeb411c70d1dd87bc33389db3 (diff)
big win32 check-inrel-0_5
Diffstat (limited to 'ev.c')
-rw-r--r--ev.c63
1 files changed, 3 insertions, 60 deletions
diff --git a/ev.c b/ev.c
index 79b3786..630a6db 100644
--- a/ev.c
+++ b/ev.c
@@ -150,64 +150,7 @@ typedef struct ev_watcher_time *WT;
static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
-#if WIN32
-/* note: the comment below could not be substantiated, but what would I care */
-/* MSDN says this is required to handle SIGFPE */
-volatile double SIGFPE_REQ = 0.0f;
-
-static int
-ev_socketpair_tcp (int filedes [2])
-{
- struct sockaddr_in addr = { 0 };
- int addr_size = sizeof (addr);
- SOCKET listener;
- SOCKET sock [2] = { -1, -1 };
-
- if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
- return -1;
-
- addr.sin_family = AF_INET;
- addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
- addr.sin_port = 0;
-
- if (bind (listener, (struct sockaddr *)&addr, addr_size))
- goto fail;
-
- if (getsockname(listener, (struct sockaddr *)&addr, &addr_size))
- goto fail;
-
- if (listen (listener, 1))
- goto fail;
-
- if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
- goto fail;
-
- if (connect (sock[0], (struct sockaddr *)&addr, addr_size))
- goto fail;
-
- if ((sock[1] = accept (listener, 0, 0)) < 0)
- goto fail;
-
- closesocket (listener);
-
- filedes [0] = sock [0];
- filedes [1] = sock [1];
-
- return 0;
-
-fail:
- closesocket (listener);
-
- if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
- if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
-
- return -1;
-}
-
-# define ev_pipe(filedes) ev_socketpair_tcp (filedes)
-#else
-# define ev_pipe(filedes) pipe (filedes)
-#endif
+#include "ev_win32.c"
/*****************************************************************************/
@@ -830,7 +773,7 @@ loop_fork (EV_P)
close (sigpipe [0]);
close (sigpipe [1]);
- while (ev_pipe (sigpipe))
+ while (pipe (sigpipe))
syserr ("(libev) error creating pipe");
siginit (EV_A);
@@ -883,7 +826,7 @@ int
ev_default_loop (int methods)
{
if (sigpipe [0] == sigpipe [1])
- if (ev_pipe (sigpipe))
+ if (pipe (sigpipe))
return 0;
if (!default_loop)