glib r6338 - in trunk: . gio gio/inotify

[alexl svn gnome org]

Author: alexl
Date: Mon Jan 21 10:35:44 2008
New Revision: 6338
URL: http://svn.gnome.org/viewvc/glib?rev=6338&view=rev

Log:
2008-01-21  Alexander Larsson  <alexl redhat com>

        * inotify/Makefile.am:
        * inotify/inotify-helper.c:
        * inotify/inotify-kernel.c:
        * inotify/inotify-path.c:
        * inotify/local_inotify.h: Removed.
        * inotify/local_inotify_syscalls.h: Removed.
	Removed the included copies of the inotify
	headers. We now only use the <sys/inotify.h>
	header which exists on modern systems.
	This fixes problems on ARM and SH5 (#510448)
	but is also generally much cleaner and future
	safe. For instance, if other OSes add support
	for inotify it should "just work".




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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan 21 10:35:44 2008
@@ -1483,10 +1483,6 @@
 dnl ** Check for inotify (GIO) **
 dnl *****************************
 inotify_support=no
-AC_CHECK_HEADERS([linux/inotify.h],
-[
-	inotify_support=yes
-])
 AC_CHECK_HEADERS([sys/inotify.h],
 [
 	inotify_support=yes

Modified: trunk/gio/inotify/Makefile.am
==============================================================================
--- trunk/gio/inotify/Makefile.am	(original)
+++ trunk/gio/inotify/Makefile.am	Mon Jan 21 10:35:44 2008
@@ -17,8 +17,6 @@
 	inotify-path.h			\
 	inotify-sub.h			\
 	inotify-helper.h		\
-	local_inotify.h			\
-	local_inotify_syscalls.h	\
 	ginotifyfilemonitor.c		\
 	ginotifyfilemonitor.h		\
 	ginotifydirectorymonitor.c	\

Modified: trunk/gio/inotify/inotify-helper.c
==============================================================================
--- trunk/gio/inotify/inotify-helper.c	(original)
+++ trunk/gio/inotify/inotify-helper.c	Mon Jan 21 10:35:44 2008
@@ -29,18 +29,7 @@
 #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 <gio/glocalfile.h>
 #include <gio/gfilemonitor.h>
 #include "inotify-helper.h"

Modified: trunk/gio/inotify/inotify-kernel.c
==============================================================================
--- trunk/gio/inotify/inotify-kernel.c	(original)
+++ trunk/gio/inotify/inotify-kernel.c	Mon Jan 21 10:35:44 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/gio/inotify/inotify-path.c
==============================================================================
--- trunk/gio/inotify/inotify-path.c	(original)
+++ trunk/gio/inotify/inotify-path.c	Mon Jan 21 10:35:44 2008
@@ -28,17 +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.
- */
-#elif defined (HAVE_LINUX_INOTIFY_H)
-#include <linux/inotify.h>
-#endif
-#endif
+#include <sys/inotify.h>
 #include <string.h>
 #include <glib.h>
 #include "inotify-kernel.h"