Merge branch 'v0.8'

joyent · Sep 3, 2012 · 3bbe8f9 · 3bbe8f9
2 parents 032c041 + b101a53
commit 3bbe8f9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/unix/tcp.c b/src/unix/tcp.c
@@ -331,7 +331,10 @@ int uv__tcp_keepalive(uv_tcp_t* handle, int enable, unsigned int delay) {
   }
 #endif
 
-#ifdef TCP_KEEPALIVE
+  /* Solaris/SmartOS, if you don't support keep-alive,
+   * then don't advertise it in your system headers...
+   */
+#if defined(TCP_KEEPALIVE) && !defined(__sun)
   if (enable && setsockopt(handle->fd,
                            IPPROTO_TCP,
                            TCP_KEEPALIVE,