git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45907b9
)
Try to fix Solaris build
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 23 Feb 2020 17:08:42 +0000
(17:08 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 23 Feb 2020 17:08:42 +0000
(17:08 +0000)
src/src/daemon.c
patch
|
blob
|
history
diff --git
a/src/src/daemon.c
b/src/src/daemon.c
index f39ab012d156423225f7e55ef42b4afefbacc82f..067bb3329bbc6fc26b006b50cd49c13cc32ea6e6 100644
(file)
--- a/
src/src/daemon.c
+++ b/
src/src/daemon.c
@@
-1056,13
+1056,17
@@
daemon_notification(void)
{
uschar buf[256], cbuf[256];
struct sockaddr_un sa_un;
{
uschar buf[256], cbuf[256];
struct sockaddr_un sa_un;
-struct iovec iov = {.iov_base = buf, .iov_len = sizeof(buf)-1};
+struct iovec iov = {.iov_base = (void *)buf, /* ? cast needed for Solaris compiler */
+ .iov_len = sizeof(buf)-1
+ };
struct msghdr msg = { .msg_name = &sa_un,
.msg_namelen = sizeof(sa_un),
.msg_iov = &iov,
.msg_iovlen = 1,
struct msghdr msg = { .msg_name = &sa_un,
.msg_namelen = sizeof(sa_un),
.msg_iov = &iov,
.msg_iovlen = 1,
+#if !defined(__sun)
.msg_control = cbuf,
.msg_controllen = sizeof(cbuf)
.msg_control = cbuf,
.msg_controllen = sizeof(cbuf)
+#endif
};
ssize_t sz;
struct cmsghdr * cp;
};
ssize_t sz;
struct cmsghdr * cp;