Bring some Solaris changes over from ClamSMTP.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/proxsmtpd.c b/src/proxsmtpd.c
index fbd5d25..e0d438e 100644
--- a/src/proxsmtpd.c
+++ b/src/proxsmtpd.c
@@ -39,14 +39,12 @@
 #include <sys/param.h>
 #include <sys/wait.h>
 
-#include <paths.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <err.h>
 #include <signal.h>
 
 #include "usuals.h"
@@ -122,6 +120,10 @@ static int wait_process(spctx_t* sp, pid_t pid, int* status);
  *  STARTUP ETC...
  */
 
+#ifndef HAVE___ARGV
+char** __argv;
+#endif
+
 int main(int argc, char* argv[])
 {
     const char* configfile = DEFAULT_CONFIG;
@@ -131,6 +133,10 @@ int main(int argc, char* argv[])
     int r;
     char* t;
 
+#ifndef HAVE___ARGV
+    __argv = argv;
+#endif
+
     /* Setup some defaults */
     memset(&g_pxstate, 0, sizeof(g_pxstate));
     g_pxstate.directory = _PATH_TMP;