contrib/xautolock/union-wait.patch
2020-11-19 15:03:13 +02:00

28 lines
917 B
Diff

diff -ru xautolock-2.2-orig/src/engine.c xautolock-2.2/src/engine.c
--- xautolock-2.2-orig/src/engine.c 2007-12-28 18:15:26.000000000 +0100
+++ xautolock-2.2/src/engine.c 2018-05-31 14:13:55.438216644 +0200
@@ -210,22 +210,14 @@
#else /* VMS */
if (lockerPid)
{
-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
- union wait status; /* childs process status */
-#else /* !UTEKV && !SYSV && !SVR4 */
int status = 0; /* childs process status */
-#endif /* !UTEKV && !SYSV && !SVR4 */
if (unlockNow && !disabled)
{
(void) kill (lockerPid, SIGTERM);
}
-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
- if (wait3 (&status, WNOHANG, 0))
-#else /* !UTEKV && !SYSV && !SVR4 */
if (waitpid (-1, &status, WNOHANG))
-#endif /* !UTEKV && !SYSV && !SVR4 */
{
/*
* If the locker exited normally, we disable any pending kill