You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
777 B
26 lines
777 B
--- a/src/engine.c
|
|
+++ b/src/engine.c
|
|
@@ -210,22 +210,14 @@ evaluateTriggers (Display* d)
|
|
#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
|