Replace "Try to fix Solaris build" with compatibility compiler flags
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 23 Feb 2020 17:36:52 +0000 (17:36 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 23 Feb 2020 17:38:53 +0000 (17:38 +0000)
This reverts commit b11989b8d73c17ccb70e22ca7e8a13540ecca73d.

src/OS/Makefile-SunOS5
src/src/daemon.c

index 33cb1f0..557c031 100644 (file)
@@ -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
index 067bb33..f39ab01 100644 (file)
@@ -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;