gnome-vfs r5433 - in trunk: . modules

[rburton svn gnome org]

Author: rburton
Date: Mon Jan 21 13:02:50 2008
New Revision: 5433
URL: http://svn.gnome.org/viewvc/gnome-vfs?rev=5433&view=rev

Log:
2008-01-21  Ross Burton  <ross openedhand com>

	* modules/local_inotify_syscalls.h:
	* modules/local_inotify.h:
	* modules/Makefile.am:
	Remove.
	
	* modules/inotify-kernel.c:
	* modules/inotify-helper.c:
	* modules/inotify-path.c:
	* configure.in:
	Instead of using local inotify headers, use the system headers.
	This fixes inotify on ARM and SH4/5 (#510999).


Removed:
   trunk/modules/local_inotify.h
   trunk/modules/local_inotify_syscalls.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/modules/Makefile.am
   trunk/modules/inotify-helper.c
   trunk/modules/inotify-kernel.c
   trunk/modules/inotify-path.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan 21 13:02:50 2008
@@ -1180,10 +1180,6 @@
 dnl **********************
 
 inotify_support=no
-AC_CHECK_HEADERS([linux/inotify.h],
-		 [
-		 inotify_support=yes
-		 ])
 AC_CHECK_HEADERS([sys/inotify.h],
 		 [
 		 inotify_support=yes

Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am	(original)
+++ trunk/modules/Makefile.am	Mon Jan 21 13:02:50 2008
@@ -43,9 +43,7 @@
 	inotify-path.h				\
 	inotify-path.c				\
 	inotify-diag.h				\
-	inotify-diag.c				\
-	local_inotify.h				\
-	local_inotify_syscalls.h
+	inotify-diag.c
 
 ###  Module setup
 if HAVE_CDDA

Modified: trunk/modules/inotify-helper.c
==============================================================================
--- trunk/modules/inotify-helper.c	(original)
+++ trunk/modules/inotify-helper.c	Mon Jan 21 13:02:50 2008
@@ -28,19 +28,7 @@
 #include <time.h>
 #include <string.h>
 #include <sys/ioctl.h>
-/* Just include the local header to stop all the pain */
-#include "local_inotify.h"
-#if 0
-#ifdef HAVE_SYS_INOTIFY_H
-/* We don't actually include the libc header, because there has been
- * problems with libc versions that was built without inotify support.
- * Instead we use the local version.
- */
-#include "local_inotify.h"
-#elif defined (HAVE_LINUX_INOTIFY_H)
-#include <linux/inotify.h>
-#endif
-#endif
+#include <sys/inotify.h>
 #include <libgnomevfs/gnome-vfs-module-shared.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include "inotify-helper.h"

Modified: trunk/modules/inotify-kernel.c
==============================================================================
--- trunk/modules/inotify-kernel.c	(original)
+++ trunk/modules/inotify-kernel.c	Mon Jan 21 13:02:50 2008
@@ -29,23 +29,7 @@
 #include <string.h>
 #include <glib.h>
 #include "inotify-kernel.h"
-
-/* Just include the local headers to stop all the pain */
-#include "local_inotify.h"
-#include "local_inotify_syscalls.h"
-#if 0
-#ifdef HAVE_SYS_INOTIFY_H
-/* We don't actually include the libc header, because there has been
- * problems with libc versions that was built without inotify support.
- * Instead we use the local version.
- */
-#include "local_inotify.h"
-#include "local_inotify_syscalls.h"
-#elif defined (HAVE_LINUX_INOTIFY_H)
-#include <linux/inotify.h>
-#include "local_inotify_syscalls.h"
-#endif
-#endif
+#include <sys/inotify.h>
 
 /* Timings for pairing MOVED_TO / MOVED_FROM events */
 #define PROCESS_EVENTS_TIME 1000 /* milliseconds (1 hz) */

Modified: trunk/modules/inotify-path.c
==============================================================================
--- trunk/modules/inotify-path.c	(original)
+++ trunk/modules/inotify-path.c	Mon Jan 21 13:02:50 2008
@@ -28,18 +28,7 @@
 /* Don't put conflicting kernel types in the global namespace: */
 #define __KERNEL_STRICT_NAMES
 
-#include "local_inotify.h"
-#if 0
-#ifdef HAVE_SYS_INOTIFY_H
-/* We don't actually include the libc header, because there has been
- * problems with libc versions that was built without inotify support.
- * Instead we use the local version.
- */
-#include "local_inotify.h"
-#elif defined (HAVE_LINUX_INOTIFY_H)
-#include <linux/inotify.h>
-#endif
-#endif
+#include <sys/inotify.h>
 #include <string.h>
 #include <glib.h>
 #include <libgnomevfs/gnome-vfs-module-shared.h>