Annotation of /trunk/xautolock/patches/xautolock-2.2-do-not-use-union-wait-type.patch
Parent Directory | Revision Log
Revision 2974 -
(hide annotations)
(download)
Wed Aug 23 09:11:08 2017 UTC (7 years, 1 month ago) by niro
File size: 981 byte(s)
Wed Aug 23 09:11:08 2017 UTC (7 years, 1 month ago) by niro
File size: 981 byte(s)
-added xautolock patches
1 | niro | 2974 | Description: Allows to build against glibc >=2.24 |
2 | Author: Aurelien Jarno <aurel32@debian.org> | ||
3 | Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833971 | ||
4 | |||
5 | --- xautolock-2.2.orig/src/engine.c | ||
6 | +++ xautolock-2.2/src/engine.c | ||
7 | @@ -240,7 +240,7 @@ evaluateTriggers (Display* d) | ||
8 | #else /* VMS */ | ||
9 | if (lockerPid) | ||
10 | { | ||
11 | -#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) | ||
12 | +#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) && !defined (__GLIBC__) | ||
13 | union wait status; /* childs process status */ | ||
14 | #else /* !UTEKV && !SYSV && !SVR4 */ | ||
15 | int status = 0; /* childs process status */ | ||
16 | @@ -251,7 +251,7 @@ evaluateTriggers (Display* d) | ||
17 | (void) kill (lockerPid, SIGTERM); | ||
18 | } | ||
19 | |||
20 | -#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) | ||
21 | +#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) && !defined (__GLIBC__) | ||
22 | if (wait3 (&status, WNOHANG, 0)) | ||
23 | #else /* !UTEKV && !SYSV && !SVR4 */ | ||
24 | if (waitpid (-1, &status, WNOHANG)) |