From e38f2c6f3dbdd5552c2a3d454e17b5bfd6cabeff Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 11 Jul 2005 16:58:58 +0000 Subject: [PATCH] Clifford Wolf: Fixed iptraf for kernel update [2005070611262215103] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6214 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/tsa/iptraf/asm_sys_types_h.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/tsa/iptraf/asm_sys_types_h.patch diff --git a/package/tsa/iptraf/asm_sys_types_h.patch b/package/tsa/iptraf/asm_sys_types_h.patch new file mode 100644 index 000000000..6552fbed3 --- /dev/null +++ b/package/tsa/iptraf/asm_sys_types_h.patch @@ -0,0 +1,18 @@ +--- ./src/tr.c 2005-07-06 11:31:33.000000000 +0200 ++++ ./src/tr.c 2005-07-06 11:30:56.000000000 +0200 +@@ -8,6 +8,15 @@ + + #include + #include ++ ++/* conflict between sys/types.h and asm/types.h */ ++#define nlink_t libc_nlink_t ++#define mode_t libc_mode_t ++#define fd_set libc_fd_set ++#define dev_t libc_dev_t ++#define gid_t libc_gid_t ++#define uid_t libc_uid_t ++ + #include + + unsigned int get_tr_ip_offset(unsigned char *pkt)