Modern BSDs don't need union wait

We have

pid_t
wait3(int *status, int options, struct rusage *rusage);

on FreeBSD and we don't need (union wait) handling.

Another good candidate for one #ifdef from imake templates.
We have already OPT_BSD_WAIT in ToolTalk's tt_options.h

diff --git a/cde/programs/dtudcexch/exportbdf.c b/cde/programs/dtudcexch/exportbdf.c
index d4eebe528380da4783cfa1b681563924ced4b1f4..95016d612718039793d1c4b952d53ceab13490fa 100644 (file)
--- a/cde/programs/dtudcexch/exportbdf.c
+++ b/cde/programs/dtudcexch/exportbdf.c
@@ -211,7 +211,7 @@ char    **comment_list ;/* pointer to the list of comments  */
        int             cnt ;
        int             comflg ;
        pid_t           chld_pid = 0;
-#if defined( SVR4 ) || defined( SYSV )
+#if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__)
        int             chld_stat ;
 #else
        union   wait    chld_stat ;

diff --git a/cde/programs/dtudcfonted/dtaddcpf/addcpf.c b/cde/programs/dtudcfonted/dtaddcpf/addcpf.c
index 1271707e01ae161652fc785e1f5227087521cf80..eb876bd39770157e8a5edd8886dfb366240a2a3e 100644 (file)
--- a/cde/programs/dtudcfonted/dtaddcpf/addcpf.c
+++ b/cde/programs/dtudcfonted/dtaddcpf/addcpf.c
@@ -86,7 +86,7 @@ static        char    *util_locale ;
 
 static pid_t   gtob_pid = 0;
 static pid_t   btop_pid = 0;
-#if defined( SVR4 ) || defined( SYSV ) || defined(__osf__)
+#if defined( SVR4 ) || defined( SYSV ) || defined(__osf__) || defined(__FreeBSD__)
 static int     chld_stat ;
 #else
 static union   wait    chld_stat ;
@@ -397,7 +397,7 @@ char        *argv[];
 #else
        fclose( WriteSnf.output );
        WaitID( btop_pid, chld_stat ) ;
-#if !defined( SVR4 ) && !defined( SYSV ) &&!defined(__osf__)
+#if !defined( SVR4 ) && !defined( SYSV ) &&!defined(__osf__) && !defined(__FreeBSD__)
        if ( !WIFEXITED(chld_stat) ) {
 #else
        if ( ! ( WIFEXITED(chld_stat) && !WEXITSTATUS(chld_stat) ) ) {

diff --git a/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c b/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c
index 966babf3637b8c97f3b2a2768b4a81ba48441e01..8df38cd445d119c7721306cd1ddf57ffbae10621 100644 (file)
--- a/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c
+++ b/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c
@@ -102,7 +102,7 @@ char        *argv[];
        char    *style ;        /* style */
        int     chk_fd;
        pid_t   chld_pid = 0;
-#if defined( SVR4 ) || defined( SYSV )
+#if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__)
        int     chld_stat ;
 #else
        union   wait    chld_stat ;
@@ -370,7 +370,7 @@ char        *argv[];
        fclose( Head.output );
        close( pfd[1] );
        wait( &exit_stat );
-#if !defined( SVR4 ) && !defined( SYSV )
+#if !defined( SVR4 ) && !defined( SYSV ) && !defined(__FreeBSD__)
        if ( !WIFEXITED(exit_stat) ) {
 #else
        if (! ( WIFEXITED(exit_stat) && !WEXITSTATUS(exit_stat) ) ) {

diff --git a/cde/programs/dtudcfonted/libfuty/getfname.c b/cde/programs/dtudcfonted/libfuty/getfname.c
index a4c2b22d1a51775daee97902da67b777d196745e..e145874ffbec2f9672f677d9079634fc0e85be8e 100644 (file)
--- a/cde/programs/dtudcfonted/libfuty/getfname.c
+++ b/cde/programs/dtudcfonted/libfuty/getfname.c
@@ -1047,7 +1047,7 @@ char      **fontname ;
 {
        FILE    *fp ;
        pid_t   chld_pid = 0;
-#if defined( SVR4 ) || defined( SYSV )
+#if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__)
        int     chld_stat ;
 #else
        union   wait    chld_stat ;

diff --git a/cde/programs/dtudcfonted/libfuty/oakfuty.c b/cde/programs/dtudcfonted/libfuty/oakfuty.c
index 359b9d9c7c9c953bf8337cb8607270616f06e9cb..4a9be0440871fa11d6402cd30674444931bedf68 100644 (file)
--- a/cde/programs/dtudcfonted/libfuty/oakfuty.c
+++ b/cde/programs/dtudcfonted/libfuty/oakfuty.c
@@ -190,7 +190,7 @@ struct ptobhead *head;
        char  buf[BUFSIZE], *p;
 
        pid_t   chld_pid = 0;
-#if defined( SVR4 ) || defined( SYSV )
+#if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__)
        int     chld_stat ;
 #else
        union   wait    chld_stat ;