On Wed, 15 Aug 2012, Marcin Cieslak wrote:
> We have
>
> pid_t
> wait3(int *status, int options, struct rusage *rusage);
>
> on FreeBSD and we don't need (union wait) handling.
>
Again - doesn't this apply to the other bsd's as well? ie use
CSRG_BASED rather than __FreeBSD__?
> Another good candidate for one #ifdef from imake templates.
> We have already OPT_BSD_WAIT in ToolTalk's tt_options.h
> ---
> cde/programs/dtudcexch/exportbdf.c | 2 +-
> cde/programs/dtudcfonted/dtaddcpf/addcpf.c | 4 ++--
> cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c | 4 ++--
> cde/programs/dtudcfonted/libfuty/getfname.c | 2 +-
> cde/programs/dtudcfonted/libfuty/oakfuty.c | 2 +-
> 5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/cde/programs/dtudcexch/exportbdf.c
> b/cde/programs/dtudcexch/exportbdf.c
> index d4eebe5..95016d6 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 1271707..eb876bd 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 966babf..8df38cd 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 a4c2b22..e145874 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 359b9d9..4a9be04 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 ;
>
--
Jon Trulson
"If the Martian rope-a-dope don't get him, he'll get himself, he'll
come in too fast and punch himself out."
- one of my brothers, referring to the Curiosity landing.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
