From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Tue, 25 Nov 2008 06:42:07 +0000 (+0000)
Subject: When compile lttctl 0.58 in fc9, I got following error message:
X-Git-Tag: 0.80~45
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7967f7c3ae01d9b9aad66167dceb2d266ace4ab1;p=ltt-control.git

When compile lttctl 0.58 in fc9, I got following error message:

Making all in lttd
make[2]: Entering directory `/home/zl/ltt-control-0.58-23112008/lttd'
gcc -DHAVE_CONFIG_H -I.. -I..     -g -O2 -MT lttd.o -MD -MP -MF
.deps/lttd.Tpo
+-c -o lttd.o lttd.c
In file included from /usr/include/asm/fcntl.h:2,
                 from /usr/include/linux/fcntl.h:5,
                 from /usr/include/linux/inotify.h:12,
                 from lttd.c:55:
/usr/include/asm-generic/fcntl.h:117: error: redefinition of 'struct
flock'
/usr/include/asm-generic/fcntl.h:140: error: redefinition of 'struct
flock64'
lttd.c: In function 'read_subbuffer':
lttd.c:467: warning: passing argument 2 of 'splice' from incompatible
pointer
+type
make[2]: *** [lttd.o] Error 1
make[2]: Leaving directory `/home/zl/ltt-control-0.58-23112008/lttd'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/zl/ltt-control-0.58-23112008'
make: *** [all] Error 2
$



git-svn-id: http://ltt.polymtl.ca/svn@3162 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/trunk/ltt-control/lttd/lttd.c b/trunk/ltt-control/lttd/lttd.c
index 30c7084..87d5630 100644
--- a/trunk/ltt-control/lttd/lttd.c
+++ b/trunk/ltt-control/lttd/lttd.c
@@ -51,7 +51,7 @@
 #define RELAY_GET_SUBBUF_SIZE   _IOR(0xF5, 0x03,__u32)
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
-#include <linux/inotify.h>
+#include <sys/inotify.h>
 /* From the inotify-tools 2.6 package */
 static inline int inotify_init (void)
 {