diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-02-23 17:36:52 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-02-23 17:38:53 +0000 |
| commit | 017de05c182145de9b46b5f8e730d928bd30abb3 (patch) | |
| tree | 0cfebd2cc40b9081e685193c829b403733b0f82f | |
| parent | b11989b8d73c17ccb70e22ca7e8a13540ecca73d (diff) | |
Replace "Try to fix Solaris build" with compatibility compiler flags
This reverts commit b11989b8d73c17ccb70e22ca7e8a13540ecca73d.
| -rw-r--r-- | src/OS/Makefile-SunOS5 | 1 | ||||
| -rw-r--r-- | src/src/daemon.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/OS/Makefile-SunOS5 b/src/OS/Makefile-SunOS5 index 33cb1f033..557c031fd 100644 --- a/src/OS/Makefile-SunOS5 +++ b/src/OS/Makefile-SunOS5 @@ -18,5 +18,6 @@ XLFLAGS=-L$(X11)/lib -R$(X11)/lib X11LIB=$(X11)/lib OS_C_INCLUDES=setenv.c +CFLAGS += -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ # End diff --git a/src/src/daemon.c b/src/src/daemon.c index 067bb3329..f39ab012d 100644 --- a/src/src/daemon.c +++ b/src/src/daemon.c @@ -1056,17 +1056,13 @@ daemon_notification(void) { uschar buf[256], cbuf[256]; struct sockaddr_un sa_un; -struct iovec iov = {.iov_base = (void *)buf, /* ? cast needed for Solaris compiler */ - .iov_len = sizeof(buf)-1 - }; +struct iovec iov = {.iov_base = buf, .iov_len = sizeof(buf)-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) -#endif }; ssize_t sz; struct cmsghdr * cp; |