X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_libc_wrapper.h;h=a4d320fef2dad37b6f32bbcc7c179422ed1bd616;hp=9a8b26a2b38725787ed070cd6f4869ae22078959;hb=2c02716281adaea9cf6f57caecaf51db8dbb0917;hpb=c895fd002763d6ae808e820020dc54e74c347fc2

diff --git a/udev_libc_wrapper.h b/udev_libc_wrapper.h
index 9a8b26a2b..a4d320fef 100644
--- a/udev_libc_wrapper.h
+++ b/udev_libc_wrapper.h
@@ -66,10 +66,22 @@
 # define __NR_inotify_add_watch	291
 # define __NR_inotify_rm_watch	292
 #else
-# error "Unsupported architecture!"
+#warning "inotify unsupported on this architecture!"
 #endif
 #endif /* __NR_inotify_init */
 
+/* dummy if we don't have the syscalls defined */
+#ifndef __NR_inotify_init
+static inline int inotify_init(void)
+{
+	return -1;
+}
+
+static inline int inotify_add_watch(int fd, const char *name, uint32_t mask)
+{
+	return -1;
+}
+#else
 /* needed until /usr/include/sys/inotify.h is working */
 #ifdef __KLIBC__
 #include <sys/inotify.h>
@@ -83,13 +95,17 @@ static inline int inotify_add_watch(int fd, const char *name, uint32_t mask)
 {
 	return syscall(__NR_inotify_add_watch, fd, name, mask);
 }
+#endif /* __KLIBC__ */
+#endif /* __NR_inotify_init */
+
+#ifndef IN_CREATE
 #define IN_CREATE		0x00000100	/* Subfile was created */
 #define IN_MOVED_FROM		0x00000040	/* File was moved from X */
 #define IN_MOVED_TO		0x00000080	/* File was moved to Y */
 #define IN_DELETE		0x00000200	/* Subfile was deleted */
 #define IN_CLOSE_WRITE		0x00000008	/* Writtable file was closed */
 #define IN_MOVE			(IN_MOVED_FROM | IN_MOVED_TO) /* moves */
-#endif /* __KLIBC__ */
+#endif /* IN_CREATE */
 
 /* needed for our signal handlers to work */
 #undef asmlinkage
@@ -122,14 +138,6 @@ static inline int inotify_add_watch(int fd, const char *name, uint32_t mask)
 #define SO_RCVBUFFORCE 33
 #endif
 
-#ifdef __KLIBC__
-static inline int clearenv(void)
-{
-	environ[0] = NULL;
-	return 0;
-}
-#endif
-
 extern uid_t lookup_user(const char *user);
 extern gid_t lookup_group(const char *group);