summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-06-21 22:24:22 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-06-21 22:24:22 +0000
commit57354898b035b176654cf44e6f874986d7a85096 (patch)
tree88ad1a55ef1e286af116c027a6e7baad094b581c /app-admin/sysklogd/files
parentupdated named.ca (bug #53848) (diff)
downloadhistorical-57354898b035b176654cf44e6f874986d7a85096.tar.gz
historical-57354898b035b176654cf44e6f874986d7a85096.tar.bz2
historical-57354898b035b176654cf44e6f874986d7a85096.zip
Updated the 2.6 headers patch to check that the <linux/list.h> header is not redefined twice in versions where it is global. Closes bug #54532.
Diffstat (limited to 'app-admin/sysklogd/files')
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch b/app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch
index 6352c7ae9b7e..251f9b1015c1 100644
--- a/app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch
+++ b/app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch
@@ -11,7 +11,7 @@ Purpose: klogd (from sysklogd-1.4.1) uses an antiquated method of
--- sysklogd-1.4.1/ksym_mod.c 2000-09-12 22:15:28.000000000 +0100
+++ sysklogd-1.4.1-plasmaroo/ksym_mod.c 2004-01-19 20:15:16.000000000 +0000
-@@ -80,9 +80,31 @@
+@@ -80,9 +80,33 @@
* Changed llseek() to lseek64() in order to skip a libc warning.
*/
@@ -33,8 +33,10 @@ Purpose: klogd (from sysklogd-1.4.1) uses an antiquated method of
+ #undef __KERNEL_STRICT_NAMES
+ #include <linux/types.h>
+
-+ #undef _LINUX_LIST_H
-+ #include <linux/list.h>
++ #ifndef LIST_POISON1
++ #undef _LINUX_LIST_H
++ #include <linux/list.h>
++ #endif
+ #include <asm/semaphore.h>
+ #undef __KERNEL__
+ #include "module.h"