On 06/12/2012 14:02, Enlightenment SVN wrote:
Log: efl: common inotify checks, simplified.Another try to make inotify checks more common. This time uses AC_CHECK_HEADERS() as for others, that already defineHAVE_SYS_INOTIFY_H, then uses that.I still kept AM_CONDITIONAL([HAVE_INOTIFY]) because I plan to convertecore_file to the same, smarter, method that is used in eio (compiling the file depending on the backend.Author: barbieri Date: 2012-12-06 05:02:59 -0800 (Thu, 06 Dec 2012) New Revision: 80358 Trac: http://trac.enlightenment.org/e/changeset/80358 Modified: trunk/efl/src/lib/eio/eio_monitor_inotify.c =================================================================== --- trunk/efl/src/lib/eio/eio_monitor_inotify.c 2012-12-06 13:01:21 UTC (rev 80357) +++ trunk/efl/src/lib/eio/eio_monitor_inotify.c 2012-12-06 13:02:59 UTC (rev 80358) @@ -20,11 +20,8 @@ #include "eio_private.h" #include "Eio.h"-#ifdef HAVE_SYS_INOTIFY+#ifdef HAVE_SYS_INOTIFY_H # include <sys/inotify.h> -#else -# include <asm/unistd.h> -# include <linux/inotify.h> #endif/*============================================================================*@@ -70,26 +67,6 @@ EIO_INOTIFY_LINE(IN_UNMOUNT, SELF_DELETED, SELF_DELETED) };-#ifndef HAVE_SYS_INOTIFY-static inline int -inotify_init(void) -{ - return syscall(__NR_inotify_init); -} - -static inline int -inotify_add_watch(int fd, const char *name, __u32 mask) -{ - return syscall(__NR_inotify_add_watch, fd, name, mask); -} - -static inline int -inotify_rm_watch(int fd, __u32 wd) -{ - return syscall(__NR_inotify_rm_watch, fd, wd); -} -#endif - static void _eio_inotify_del(void *data) { Modified: trunk/efl/src/lib/eio/eio_monitor_poll.c =================================================================== --- trunk/efl/src/lib/eio/eio_monitor_poll.c 2012-12-06 13:01:21 UTC (rev 80357) +++ trunk/efl/src/lib/eio/eio_monitor_poll.c 2012-12-06 13:02:59 UTC (rev 80358) @@ -270,7 +270,7 @@ * @cond LOCAL */-#if !defined HAVE_INOTIFY && !defined HAVE_NOTIFY_WIN32+#if !defined HAVE_SYS_INOTIFY_H && !defined HAVE_NOTIFY_WIN32 void eio_monitor_backend_init(void) { }
<<attachment: guillaume_friloux.vcf>>
------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel