mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-13 11:42:21 +00:00
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
This commit is contained in:
parent
a35975a334
commit
ce4004f86b
5 changed files with 7 additions and 7 deletions
|
@ -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 ;
|
||||
|
|
|
@ -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) ) ) {
|
||||
|
|
|
@ -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) ) ) {
|
||||
|
|
|
@ -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 ;
|
||||
|
|
|
@ -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 ;
|
||||
|
|
Loading…
Reference in a new issue