Commit 538640ff authored by Dave Love's avatar Dave Love

Remove union wait

Being removed from glibc and apparently long obsolete in BSD
parent c9de3e48
......@@ -47,9 +47,9 @@ RCSID("$tcsh: sh.proc.c,v 3.109 2009/06/25 21:15:37 christos Exp $")
# define HZ 16
#endif /* aiws */
#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(linux) || defined(__GNU__) || defined(__GLIBC__)
#if (defined(IRIS4D) && __STDC__) || defined(__lucid)
# define BSDWAIT
#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */
#endif /* (IRIS4D && __STDC__) || __lucid */
#ifndef WTERMSIG
# define WTERMSIG(w) (((union wait *) &(w))->w_termsig)
# ifndef BSDWAIT
......
......@@ -303,10 +303,6 @@ static void qevent_start_trigger_script(int qevent_event, const char* script_fil
#if !__INTERIX
struct rusage rusage;
#endif
#if defined(SVR3) || defined(_BSD)
union wait status;
#else
int status;
#endif
#if __INTERIX
......@@ -314,11 +310,7 @@ static void qevent_start_trigger_script(int qevent_event, const char* script_fil
#else
wait3(&status, 0, &rusage);
#endif
#if defined(SVR3) || defined(_BSD)
exit_status = status.w_retcode;
#else
exit_status = status;
#endif
if ( WEXITSTATUS(exit_status) == 0 ) {
INFO((SGE_EVENT,"exit status of script: "sge_U32CFormat"\n", sge_u32c(WEXITSTATUS(exit_status))));
......
......@@ -138,11 +138,7 @@ static void sge_send_mail(u_long32 progid, const char *mailer_in,
struct rusage rusage;
#endif
#if defined(SVR3) || defined(_BSD)
union wait status;
#else
int status;
#endif
DENTER(TOP_LAYER, "sge_send_mail");
......@@ -277,11 +273,7 @@ static void sge_send_mail(u_long32 progid, const char *mailer_in,
exit(1);
}
#if defined(SVR3) || defined(_BSD)
exit_status = status.w_retcode;
#else
exit_status = status;
#endif
DPRINTF(("mailer exited with exit status %d\n", exit_status));
exit(exit_status);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment