From: Bert Belder Date: Thu, 25 Nov 2010 04:19:08 +0000 (+0100) Subject: Don't break the linux build X-Git-Tag: v0.3.4~55 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03a74efb16882061c9e5e8bf7cc88d7b56002c36;p=platform%2Fupstream%2Fnodejs.git Don't break the linux build --- diff --git a/src/node_file.cc b/src/node_file.cc index 5ad5f4d..71f3258 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -24,9 +24,9 @@ #define PATH_MAX 4096 #endif -/* HACK to use pread/pwrite from eio if our platform doesn't have it /* +/* HACK to use pread/pwrite from eio because MINGW32 doesn't have it /* /* TODO fixme */ -#if !HAVE_PREADWRITE +#if __MINGW32__ # define pread eio__pread # define pwrite eio__pwrite #endif diff --git a/src/node_net.cc b/src/node_net.cc index 3242fa7..d4de404 100644 --- a/src/node_net.cc +++ b/src/node_net.cc @@ -257,9 +257,6 @@ static socklen_t addrlen; static inline Handle ParseAddressArgs(Handle first, Handle second, bool is_bind) { -#ifdef __POSIX__ // No unix sockets on windows - static struct sockaddr_un un; -#endif static struct sockaddr_in in; static struct sockaddr_in6 in6; @@ -553,11 +550,14 @@ static Handle Listen(const Arguments& args) { FD_ARG(args[0]) int backlog = args[1]->IsInt32() ? args[1]->Int32Value() : 128; +#ifdef __POSIX__ + if (0 > listen(fd, backlog)) { +#else // __MINGW32__ if (0 > listen(_get_osfhandle(fd), backlog)) { +#endif return ThrowException(ErrnoException(errno, "listen")); } - return Undefined(); }