From: Willy Tarreau <w@1wt.eu>
Date: Sun, 8 Mar 2009 21:25:28 +0000 (+0100)
Subject: [BUILD] build fixes for Solaris
X-Git-Tag: v1.3.16-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87bed62a9275f68967b8a33c22713e14814dd5f9;p=thirdparty%2Fhaproxy.git

[BUILD] build fixes for Solaris

One build error in stream_sock.c when MSG_NOSIGNAL is not defined,
and a warning in task.c.
---

diff --git a/src/stream_sock.c b/src/stream_sock.c
index 65a1e379c7..e68775a59c 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -560,11 +560,11 @@ static int stream_sock_write_loop(struct stream_interface *si, struct buffer *b)
 			int skerr;
 			socklen_t lskerr = sizeof(skerr);
 
-			ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &skerr, &lskerr);
+			ret = getsockopt(si->fd, SOL_SOCKET, SO_ERROR, &skerr, &lskerr);
 			if (ret == -1 || skerr)
 				ret = -1;
 			else
-				ret = send(fd, b->w, max, MSG_DONTWAIT);
+				ret = send(si->fd, b->w, max, MSG_DONTWAIT);
 		}
 #else
 		ret = send(si->fd, b->w, max, MSG_DONTWAIT | MSG_NOSIGNAL);
diff --git a/src/task.c b/src/task.c
index e91a26b1dc..6f7b264066 100644
--- a/src/task.c
+++ b/src/task.c
@@ -10,6 +10,8 @@
  *
  */
 
+#include <string.h>
+
 #include <common/config.h>
 #include <common/eb32tree.h>
 #include <common/memory.h>