Replace "Try to fix Solaris build" with compatibility compiler flags

This reverts commit b11989b8d73c17ccb70e22ca7e8a13540ecca73d.

diff --git a/src/OS/Makefile-SunOS5 b/src/OS/Makefile-SunOS5
index 33cb1f0337fcf776265bf800b313ec66be712fd7..557c031fd41011424ee13253b9a2cf5d08d4bee0 100644 (file)
--- 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 067bb3329bbc6fc26b006b50cd49c13cc32ea6e6..f39ab012d156423225f7e55ef42b4afefbacc82f 100644 (file)
--- 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;