# 
# 
# patch "ChangeLog"
#  from [7a0eb7f7c256403027c14a0e578ca26b19c036e2]
#    to [09fafc8bc2548051f1095a12d6464f3c1d1c6f50]
# 
# patch "netxx_pipe.cc"
#  from [de563b49e4d6430a5f86c0e2f817d2db178acf6d]
#    to [f0323062bacd164cdb4c3fb985e3cedec03f0f92]
# 
============================================================
--- ChangeLog	7a0eb7f7c256403027c14a0e578ca26b19c036e2
+++ ChangeLog	09fafc8bc2548051f1095a12d6464f3c1d1c6f50
@@ -1,3 +1,8 @@
+2006-06-07  Nathaniel Smith  <address@hidden>
+
+	* netxx_pipe.cc (simple_pipe_test): Another test failure,
+	another klugey #ifdef...
+
 2006-06-07  Graydon Hoare  <address@hidden>
 
 	* netxx_pipe.cc (simple_pipe_test): Attempt to fix broken unit
============================================================
--- netxx_pipe.cc	de563b49e4d6430a5f86c0e2f817d2db178acf6d
+++ netxx_pipe.cc	f0323062bacd164cdb4c3fb985e3cedec03f0f92
@@ -567,7 +567,11 @@
           probe.add(pipe, Netxx::Probe::ready_read);
           res = probe.ready(timeout);
           E(res.second & Netxx::Probe::ready_read, F("timeout reading data %d") % c);
+#ifdef WIN32
+          I(res.first == pipe.get_socketfd());
+#else
           I(res.first == pipe.get_readfd());
+#endif
           int bytes = pipe.read(buf, sizeof(buf));
           result += std::string(buf, bytes);
         }