tracker r2370 - in trunk: . src/libinotify

[mr svn gnome org]

Author: mr
Date: Tue Oct 14 10:58:32 2008
New Revision: 2370
URL: http://svn.gnome.org/viewvc/tracker?rev=2370&view=rev

Log:
	* src/libinotify/Makefile.am:
	* src/libinotify/inotify-handle.c:
	* src/libinotify/inotify-monitor.c: Include <sys/inotify.h>, not
	<linux/inotify.h> and removed libinotify/linux-inotify-syscalls.h,
	this fixes bug #556196 (John Millikin).


Removed:
   trunk/src/libinotify/linux-inotify-syscalls.h
Modified:
   trunk/ChangeLog
   trunk/src/libinotify/Makefile.am
   trunk/src/libinotify/inotify-handle.c
   trunk/src/libinotify/inotify-monitor.c

Modified: trunk/src/libinotify/Makefile.am
==============================================================================
--- trunk/src/libinotify/Makefile.am	(original)
+++ trunk/src/libinotify/Makefile.am	Tue Oct 14 10:58:32 2008
@@ -15,7 +15,6 @@
 	inotify-handle.h 				\
 	inotify-listhash.h 				\
 	inotify-log.h 					\
-	linux-inotify-syscalls.h			\
 	libinotify.h
 
 libinotify_la_LDFLAGS = -version-info 0:0:0

Modified: trunk/src/libinotify/inotify-handle.c
==============================================================================
--- trunk/src/libinotify/inotify-handle.c	(original)
+++ trunk/src/libinotify/inotify-handle.c	Tue Oct 14 10:58:32 2008
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <linux/inotify.h>
+#include <sys/inotify.h>
 
 #include "inotify-handle.h"
 #include "inotify-log.h"

Modified: trunk/src/libinotify/inotify-monitor.c
==============================================================================
--- trunk/src/libinotify/inotify-monitor.c	(original)
+++ trunk/src/libinotify/inotify-monitor.c	Tue Oct 14 10:58:32 2008
@@ -21,9 +21,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <linux/inotify.h>
-
-#include "linux-inotify-syscalls.h"
+#include <sys/inotify.h>
+#include <unistd.h>
 
 #include "inotify-handle.h"
 #include "inotify-listhash.h"