Merge from vendor branch TNF:
[pkgsrc.git] / mail / mailagent / patches / patch-ac
1 $NetBSD$
2
3 --- agent/filter/io.c.orig      Wed Jul 29 02:41:11 1998
4 +++ agent/filter/io.c   Mon Aug 10 21:01:22 1998
5 @@ -120,6 +120,9 @@
6  #ifdef I_SYS_IOCTL
7  #include <sys/ioctl.h>
8  #endif
9 +#ifdef I_SYS_PARAM
10 +#include <sys/param.h>
11 +#endif
12  
13  /*
14   * The following should be defined in <sys/stat.h>.
15 @@ -713,7 +716,7 @@
16          */
17         
18         char **envp;                    /* Environment pointer */
19 -#ifdef UNION_WAIT
20 +#if defined(UNION_WAIT) && (!defined(BSD) || BSD < 199306)
21         union wait status;              /* Waiting status */
22  #else
23         int status;                             /* Status from command */