x11-misc/xautolock/files/xautolock-2.2_p5_p1-waitpid.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

--- 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