From c0fba3c4acc52dba67461e485a3798cfa236761b Mon Sep 17 00:00:00 2001
From: Jeff Olson <olson.jeffery@gmail.com>
Date: Wed, 21 Aug 2013 15:13:01 -0700
Subject: [PATCH] rt: re-adding lines erroneous stripped out in merge conflict

---
 src/rt/rust_uv.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp
index 43e6b97bc186..f90931dbea92 100644
--- a/src/rt/rust_uv.cpp
+++ b/src/rt/rust_uv.cpp
@@ -13,12 +13,21 @@
 #include <malloc.h>
 #endif
 
+#ifndef __WIN32__
+// for signal
+#include <signal.h>
+#endif
+
 #include "uv.h"
 
 #include "rust_globals.h"
 
 extern "C" void*
 rust_uv_loop_new() {
+// XXX libuv doesn't always ignore SIGPIPE even though we don't need it.
+#ifndef __WIN32__
+    signal(SIGPIPE, SIG_IGN);
+#endif 
     return (void*)uv_loop_new();
 }