[Crackerjack-devel-changes] SF.net SVN: crackerjack:[1007] trunk/crackerjack/testcases

[<cas...@us...>]

Revision: 1007
          http://crackerjack.svn.sourceforge.net/crackerjack/?rev=1007&view=rev
Author:   casparant
Date:     2010-12-22 17:22:48 +0000 (Wed, 22 Dec 2010)

Log Message:
-----------
Fix redefinition of 'struct flock' error

in inotify_add/rm_watch testcases, mixing using glibc headers and kernel
headers causes including conflict:

make[1]: Entering directory
`/root/crackerjack/testcases/inotify_rm_watch/basic'
gcc -Wall -O2 -I/lib/modules/2.6.32-19.el6.i686/build/include -o test
basic.c ../../common.j.h/common_j_h.c
/lib/modules/2.6.32-19.el6.i686/build/include/asm-generic/fcntl.h:139:
error: redefinition of 'struct flock'
/lib/modules/2.6.32-19.el6.i686/build/include/linux/fcntl.h:16:1:
warning: "F_DUPFD_CLOEXEC" redefined
/usr/include/bits/fcntl.h:107:1: warning: this is the location of the
previous definition

Replace kernel headers to glibc headers.

Signed-off-by: Caspar Zhang <cz...@re...>

Modified Paths:
--------------
    trunk/crackerjack/testcases/inotify_add_watch/basic/basic.c
    trunk/crackerjack/testcases/inotify_rm_watch/basic/basic.c

Modified: trunk/crackerjack/testcases/inotify_add_watch/basic/basic.c
===================================================================
--- trunk/crackerjack/testcases/inotify_add_watch/basic/basic.c	2010-12-21 08:24:59 UTC (rev 1006)
+++ trunk/crackerjack/testcases/inotify_add_watch/basic/basic.c	2010-12-22 17:22:48 UTC (rev 1007)
@@ -27,6 +27,7 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/inotify.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <getopt.h>
@@ -37,7 +38,6 @@
 #include <unistd.h>
 #include <libgen.h>
 #include <limits.h>
-#include <linux/inotify.h>
 
 #include "../../common.j.h/include_j_h.h"
 

Modified: trunk/crackerjack/testcases/inotify_rm_watch/basic/basic.c
===================================================================
--- trunk/crackerjack/testcases/inotify_rm_watch/basic/basic.c	2010-12-21 08:24:59 UTC (rev 1006)
+++ trunk/crackerjack/testcases/inotify_rm_watch/basic/basic.c	2010-12-22 17:22:48 UTC (rev 1007)
@@ -27,6 +27,7 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/inotify.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <getopt.h>
@@ -37,7 +38,6 @@
 #include <unistd.h>
 #include <libgen.h>
 #include <limits.h>
-#include <linux/inotify.h>
 
 #include "../../common.j.h/include_j_h.h"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.