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

[ltt-control.git] / trunk / ltt-control / lttd / lttd.c

diff --git a/trunk/ltt-control/lttd/lttd.c b/trunk/ltt-control/lttd/lttd.c
index 06af633741a319c6a13c410c2198bcfe9d98860c..87d5630c200983ed2d6cfc6af5e5016705130752 100644 (file)
--- 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)
 {
@@ -437,7 +437,8 @@ int read_subbuffer(struct fd_pair *pair)
        unsigned int consumed_old;
        int err;
        long ret;
-       unsigned long len, offset;
+       unsigned long len;
+       off_t offset;
 
 
        err = ioctl(pair->channel, RELAY_GET_SUBBUF, &consumed_old);
@@ -462,7 +463,8 @@ int read_subbuffer(struct fd_pair *pair)
        len = pair->subbuf_size;
        offset = 0;
        while (len > 0) {
-               printf_verbose("splice chan to pipe offset %lu\n", offset);
+               printf_verbose("splice chan to pipe offset %lu\n",
+                       (unsigned long)offset);
                ret = splice(pair->channel, &offset, thread_pipe[1], NULL,
                        len, SPLICE_F_MOVE);
                printf_verbose("splice chan to pipe ret %ld\n", ret);