From e4ba1fad3646506c14c1dfa912101a5983f3833b Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Tue, 11 Apr 2017 20:40:43 +0100 Subject: [PATCH] Change pid wait types to int on Linux as well. Fixes compile issue in dtudc programs on ubuntu 16.10+ --- cde/programs/dtudcexch/exportbdf.c | 2 +- cde/programs/dtudcfonted/dtaddcpf/addcpf.c | 2 +- cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c | 2 +- cde/programs/dtudcfonted/libfuty/getfname.c | 2 +- cde/programs/dtudcfonted/libfuty/oakfuty.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cde/programs/dtudcexch/exportbdf.c b/cde/programs/dtudcexch/exportbdf.c index dbcc228d..8e88e42f 100644 --- a/cde/programs/dtudcexch/exportbdf.c +++ b/cde/programs/dtudcexch/exportbdf.c @@ -212,7 +212,7 @@ char **comment_list ;/* pointer to the list of comments */ int cnt ; int comflg ; pid_t chld_pid = 0; -#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) +#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) || defined(linux) 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 88db180a..b9b63205 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__) || defined(CSRG_BASED) +#if defined( SVR4 ) || defined( SYSV ) || defined(__osf__) || defined(CSRG_BASED) || defined(linux) static int chld_stat ; #else static union wait chld_stat ; diff --git a/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c b/cde/programs/dtudcfonted/dtcpftogpf/cpftogpf.c index 935e9f47..4516c80c 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 ) || defined(CSRG_BASED) +#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) || defined(linux) int chld_stat ; #else union wait chld_stat ; diff --git a/cde/programs/dtudcfonted/libfuty/getfname.c b/cde/programs/dtudcfonted/libfuty/getfname.c index 21f92ddc..a0b3bd97 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 ) || defined(CSRG_BASED) +#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) || defined(linux) 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 0b73c56a..7c37bc8a 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 ) || defined(CSRG_BASED) +#if defined( SVR4 ) || defined( SYSV ) || defined(CSRG_BASED) || defined(linux) int chld_stat ; #else union wait chld_stat ; -- 2.25.1