Logo
Explore Help
Sign In
public/nixpkgs
1
0
Fork 0
You've already forked nixpkgs
Code Issues Pull Requests Packages Projects Releases Wiki Activity
nixpkgs/pkgs/os-specific/linux/sysklogd/union-wait.patch

12 lines
351 B
Diff
Raw Permalink Normal View History

sysklogd: fix compile error (#18133) sysklogd was failing to build because it didn't know the size of the `union wait` type. Running `git bisect` showed 9744c7768d0e6920623a16a4e9d604de2fd52f34, which bumped glibc from 2.23 to 2.24, as the likely suspect. This is corroborated by evidence such as this email: https://lists.debian.org/debian-glibc/2016/08/msg00069.html Linux from scratch recommends changing `union wait` to `int`: http://www.linuxfromscratch.org/lfs/view/development/chapter06/sysklogd.html Therefore, that's what this commit does.
2016-08-30 23:05:07 +01:00
--- sysklogd-1.5-old/syslogd.c 2016-08-30 22:50:59.812926945 +0100
+++ sysklogd-1.5/syslogd.c 2016-08-30 22:51:12.008842890 +0100
@@ -2094,7 +2094,7 @@
(void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */
wait ((int *)0);
#else
- union wait status;
+ int status;
while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
;
Reference in New Issue Copy Permalink
Powered by Gitea Version: 1.23.8 Page: 7804ms Template: 14ms
English
Bahasa Indonesia Deutsch English Español Français Gaeilge Italiano Latviešu Magyar nyelv Nederlands Polski Português de Portugal Português do Brasil Suomi Svenska Türkçe Čeština Ελληνικά Български Русский Українська فارسی മലയാളം 日本語 简体中文 繁體中文(台灣) 繁體中文(香港) 한국어
Licenses API