#
#
# patch "netxx_pipe.cc"
#  from [d4195cd958d6f394b611aed34bd01754133cf482]
#    to [50d7d437652ab7cda2cdced5770532eb5d2cd660]
# 
# patch "unix/socketpair.c"
#  from [20cce52deb8de9cdc77a6aea47332319a7364778]
#    to [a8769859a309c34f09511339a220105b9a93c2bc]
#
============================================================
--- netxx_pipe.cc	d4195cd958d6f394b611aed34bd01754133cf482
+++ netxx_pipe.cc	50d7d437652ab7cda2cdced5770532eb5d2cd660
@@ -23,6 +23,7 @@
 #else
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/socket.h>
 #include <sys/wait.h>
 #include <errno.h>
 #endif
@@ -187,17 +188,17 @@ Netxx::SpawnedStream::SpawnedStream (con
   if (child < 0)
     {
       // fork failed
-      socket(socks[0]);
-      socket(socks[1]);
+      ::close (socks[0]);
+      ::close (socks[1]);
 
-      E(started, F("fork failed %s") % strerror(errno));
+      E(0, F("fork failed %s") % strerror(errno));
     }
 
   if (!child)
     {
       // We are in the child process; run the command, then exit.
 
-      socket_type old_stdio[2];
+      int old_stdio[2];
 
       // Set the child socket as stdin and stdout. dup2 clobbers its first
       // arg, so copy it first.
@@ -214,8 +215,8 @@ Netxx::SpawnedStream::SpawnedStream (con
         }
 
       // old_stdio now holds the file descriptors for our old stdin, stdout, so close them
-      close (old_stdio[0]);
-      close (old_stdio[1]);
+      ::close (old_stdio[0]);
+      ::close (old_stdio[1]);
 
       execvp(newargv[0], const_cast<char * const *>(newargv));
       perror(newargv[0]);
@@ -353,3 +354,5 @@ catch (informative_failure &e)
 // indent-tabs-mode: nil
 // End:
 // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
+
+* netxx_pipe.cc (SpawnedStream::SpawnedStream):
============================================================
--- unix/socketpair.c	20cce52deb8de9cdc77a6aea47332319a7364778
+++ unix/socketpair.c	a8769859a309c34f09511339a220105b9a93c2bc
@@ -22,8 +22,8 @@
 
 #include <string.h>
 
-include <sys/types.h>
-include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
 int dumb_socketpair(int socks[2], int dummy)
 {