debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modern BSDs don't need union wait

Browse Source 
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
This commit is contained in:
Marcin Cieslak
2012-08-15 19:46:02 +02:00
committed by Jon Trulson
parent a35975a334
commit ce4004f86b
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtudcexch/exportbdf.c
View File

@@ -211,7 +211,7 @@ char **comment_list ;/* pointer to the list of comments */
int cnt ; int cnt ;
int comflg ; int comflg ;
pid_t chld_pid = 0; pid_t chld_pid = 0;
#if defined( SVR4 ) || defined( SYSV ) #if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__)
int chld_stat ; int chld_stat ;
#else #else
union wait chld_stat ; union wait chld_stat ;

4
cde/programs/dtudcfonted/dtaddcpf/addcpf.c
View File

@@ -86,7 +86,7 @@ static char *util_locale ;
static pid_t gtob_pid = 0; static pid_t gtob_pid = 0;
static pid_t btop_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 ; static int chld_stat ;
#else #else
static union wait chld_stat ; static union wait chld_stat ;
@@ -397,7 +397,7 @@ char *argv[];
#else #else
fclose( WriteSnf.output ); fclose( WriteSnf.output );
WaitID( btop_pid, chld_stat ) ; 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) ) { if ( !WIFEXITED(chld_stat) ) {
#else #else
if ( ! ( WIFEXITED(chld_stat) && !WEXITSTATUS(chld_stat) ) ) { if ( ! ( WIFEXITED(chld_stat) && !WEXITSTATUS(chld_stat) ) ) {

4
cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c
View File

@@ -102,7 +102,7 @@ char *argv[];
char *style ; /* style */ char *style ; /* style */
int chk_fd; int chk_fd;
pid_t chld_pid = 0; pid_t chld_pid = 0;
#if defined( SVR4 ) || defined( SYSV ) #if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__)
int chld_stat ; int chld_stat ;
#else #else
union wait chld_stat ; union wait chld_stat ;
@@ -370,7 +370,7 @@ char *argv[];
fclose( Head.output ); fclose( Head.output );
close( pfd[1] ); close( pfd[1] );
wait( &exit_stat ); wait( &exit_stat );
#if !defined( SVR4 ) && !defined( SYSV ) #if !defined( SVR4 ) && !defined( SYSV ) && !defined(__FreeBSD__)
if ( !WIFEXITED(exit_stat) ) { if ( !WIFEXITED(exit_stat) ) {
#else #else
if (! ( WIFEXITED(exit_stat) && !WEXITSTATUS(exit_stat) ) ) { if (! ( WIFEXITED(exit_stat) && !WEXITSTATUS(exit_stat) ) ) {

2
cde/programs/dtudcfonted/libfuty/getfname.c
View File

@@ -1047,7 +1047,7 @@ char **fontname ;
{ {
FILE *fp ; FILE *fp ;
pid_t chld_pid = 0; pid_t chld_pid = 0;
#if defined( SVR4 ) || defined( SYSV ) #if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__)
int chld_stat ; int chld_stat ;
#else #else
union wait chld_stat ; union wait chld_stat ;

2
cde/programs/dtudcfonted/libfuty/oakfuty.c
View File

@@ -190,7 +190,7 @@ struct ptobhead *head;
char buf[BUFSIZE], *p; char buf[BUFSIZE], *p;
pid_t chld_pid = 0; pid_t chld_pid = 0;
#if defined( SVR4 ) || defined( SYSV ) #if defined( SVR4 ) || defined( SYSV ) || defined(__FreeBSD__)
int chld_stat ; int chld_stat ;
#else #else
union wait chld_stat ; union wait chld_stat ;