From: Marcin Cieslak <saper@saper.info>
Date: Wed, 15 Aug 2012 17:46:02 +0000 (+0200)
Subject: Modern BSDs don't need union wait
X-Git-Tag: 2.2.0b~81^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce4004f86b82d464f701e429c8f2d74067320c5e;p=oweals%2Fcde.git

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 d4eebe52..95016d61 100644
--- 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 1271707e..eb876bd3 100644
--- 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 966babf3..8df38cd4 100644
--- 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 a4c2b22d..e145874f 100644
--- 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 359b9d9c..4a9be044 100644
--- 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 ;