upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-23 07:08:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[BUILD] build fixes for Solaris

Browse source 
One build error in stream_sock.c when MSG_NOSIGNAL is not defined,
and a warning in task.c.
This commit is contained in:
Willy Tarreau 2009-03-08 22:25:28 +01:00
parent 7c84bab879
commit 87bed62a92
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/stream_sock.c
View file

@ -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);

2
src/task.c
View file

@ -10,6 +10,8 @@
*
*/
#include <string.h>
#include <common/config.h>
#include <common/eb32tree.h>
#include <common/memory.h>