diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-17 12:05:27 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-17 12:05:27 +0000 |
| commit | 7d14264671317d0d01579cf0579839e71781b391 (patch) | |
| tree | b39494d9aed00735748949d2653120b24b943e27 /main/xautolock/processwait.patch | |
| parent | 672e98e1970eb737fde64c48ff3e160b8f1af937 (diff) | |
| download | aports-7d14264671317d0d01579cf0579839e71781b391.tar.bz2 aports-7d14264671317d0d01579cf0579839e71781b391.tar.xz | |
main/xautolock: move from testing
Diffstat (limited to 'main/xautolock/processwait.patch')
| -rw-r--r-- | main/xautolock/processwait.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/main/xautolock/processwait.patch b/main/xautolock/processwait.patch new file mode 100644 index 0000000000..8a8509a6b7 --- /dev/null +++ b/main/xautolock/processwait.patch @@ -0,0 +1,33 @@ +--- src/engine.c.orig 2014-08-28 12:50:56.086307943 +0000 ++++ src/engine.c 2014-08-28 12:50:59.496333650 +0000 +@@ -209,24 +209,24 @@ evaluateTriggers (Display* d) + { + #else /* VMS */ + if (lockerPid) + { +-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) ++#if (!defined (UTEKV) && !defined (SYSV) && !defined (SVR4)) && defined (__GLIBC__) + union wait status; /* childs process status */ +-#else /* !UTEKV && !SYSV && !SVR4 */ ++#else /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */ + int status = 0; /* childs process status */ +-#endif /* !UTEKV && !SYSV && !SVR4 */ ++#endif /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */ + + if (unlockNow && !disabled) + { + (void) kill (lockerPid, SIGTERM); + } + +-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) ++#if (!defined (UTEKV) && !defined (SYSV) && !defined (SVR4)) && defined (__GLIBC__) + if (wait3 (&status, WNOHANG, 0)) +-#else /* !UTEKV && !SYSV && !SVR4 */ ++#else /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */ + if (waitpid (-1, &status, WNOHANG)) +-#endif /* !UTEKV && !SYSV && !SVR4 */ ++#endif /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */ + { + /* + * If the locker exited normally, we disable any pending kill + * trigger. Otherwise, we assume that it either has crashed or |