muine r1214 - in trunk: . plugins

[lmedinas svn gnome org]

Author: lmedinas
Date: Tue Sep 23 15:13:39 2008
New Revision: 1214
URL: http://svn.gnome.org/viewvc/muine?rev=1214&view=rev

Log:
2008-09-23  Luis Medinas  <lmedinas gnome org>

        * configure.in:
        * plugins/Makefile.am:
        * plugins/inotify-glue.c (inotify_glue_watch),
        (inotify_glue_ignore):
        * plugins/inotify-syscalls.h:
        * plugins/inotify.h:

        Use system inotify instead of the built one. Patch 
        from Adrian Bunk <bunk stusta de> minor by me. 
        Closes bgo #553155.


Removed:
   trunk/plugins/inotify-syscalls.h
   trunk/plugins/inotify.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/Makefile.am
   trunk/plugins/inotify-glue.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Sep 23 15:13:39 2008
@@ -76,16 +76,6 @@
 fi
 AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes")
 
-dnl check for OS
-case "$target" in
-	*-*-linux*)
-		os_has_inotify=yes
-		;;
-	*)
-		os_has_inotify=no
-		;;
-esac
-
 dnl inotify
 
 AC_ARG_ENABLE([inotify],
@@ -93,7 +83,9 @@
          enable_inotify=$enableval,
          enable_inotify=auto)
 
-if test "x$os_has_inotify" = "xno"; then
+AC_CHECK_HEADERS(sys/inotify.h)
+
+if test "x$ac_cv_header_sys_inotify_h" = "xno"; then
 	dnl error out if user has explicitly requested inotify
 	if test "x$enable_inotify" = "xyes"; then
 		AC_MSG_ERROR([inotify is unavailable on your system architecture])

Modified: trunk/plugins/Makefile.am
==============================================================================
--- trunk/plugins/Makefile.am	(original)
+++ trunk/plugins/Makefile.am	Tue Sep 23 15:13:39 2008
@@ -15,7 +15,7 @@
 muinelib_LTLIBRARIES =
 endif
 
-libinotifyglue_la_SOURCES = inotify-glue.c inotify.h inotify-syscalls.h
+libinotifyglue_la_SOURCES = inotify-glue.c
 
 TRAY_ICON_CSFILES =			\
 	$(srcdir)/TrayIcon.cs		\

Modified: trunk/plugins/inotify-glue.c
==============================================================================
--- trunk/plugins/inotify-glue.c	(original)
+++ trunk/plugins/inotify-glue.c	Tue Sep 23 15:13:39 2008
@@ -34,9 +34,7 @@
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 #include <sys/types.h>
-
-#include "inotify.h"
-#include "inotify-syscalls.h"
+#include <sys/inotify.h>
 
 #define PROCFS_PREFIX           "/proc/sys/fs/inotify"
 
@@ -96,7 +94,7 @@
 
 
 int
-inotify_glue_watch (int fd, const char *filename, __u32 mask)
+inotify_glue_watch (int fd, const char *filename, uint32_t mask)
 {
 	int wd;
 
@@ -114,7 +112,7 @@
 
 
 int
-inotify_glue_ignore (int fd, __u32 wd)
+inotify_glue_ignore (int fd, uint32_t wd)
 {
 	int ret;