Permalink
Browse files

unix: don't conditionally compile kqueue fs watcher

Always compile in the kqueue-based fs event watcher and handle it at run-time
if the kernel doesn't actually support it.

Works around build issues when -mmacosx-version-min is not set properly.

Fixes nodejs/node-v0.x-archive#3075.

Conflicts:

	src/unix/kqueue.c
  • Loading branch information...
1 parent ab8c3b8 commit 56bb4c27c70555eb8b0f09e7c38078342acf825f @bnoordhuis bnoordhuis committed with isaacs Apr 9, 2012
Showing with 26 additions and 29 deletions.
  1. +1 −1 include/uv-private/uv-unix.h
  2. +24 −0 src/unix/ev/ev_kqueue.c
  3. +1 −1 src/unix/internal.h
  4. +0 −27 src/unix/kqueue.c
@@ -223,7 +223,7 @@ typedef void* uv_lib_t;
ev_io read_watcher; \
uv_fs_event_cb cb;
-#elif (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) \
+#elif defined(__APPLE__) \
|| defined(__FreeBSD__) \
|| defined(__OpenBSD__) \
|| defined(__NetBSD__)
View
@@ -43,6 +43,30 @@
#include <string.h>
#include <errno.h>
+/* These are the same on OS X and the BSDs. */
+#ifndef NOTE_DELETE
+# define NOTE_DELETE 0x01
+#endif
+#ifndef NOTE_WRITE
+# define NOTE_WRITE 0x02
+#endif
+#ifndef NOTE_EXTEND
+# define NOTE_EXTEND 0x04
+#endif
+#ifndef NOTE_ATTRIB
+# define NOTE_ATTRIB 0x08
+#endif
+#ifndef NOTE_LINK
+# define NOTE_LINK 0x10
+#endif
+#ifndef NOTE_RENAME
+# define NOTE_RENAME 0x20
+#endif
+#ifndef NOTE_REVOKE
+# define NOTE_REVOKE 0x40
+#endif
+
+
extern void
uv__kqueue_hack (EV_P_ int fflags, ev_io *w);
View
@@ -125,7 +125,7 @@ inline static int sys_accept4(int fd,
#endif
/* FIXME exact copy of the #ifdef guard in uv-unix.h */
-#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) \
+#if defined(__APPLE__) \
|| defined(__FreeBSD__) \
|| defined(__OpenBSD__) \
|| defined(__NetBSD__)
View
@@ -26,8 +26,6 @@
#include <string.h>
#include <errno.h>
-#if HAVE_KQUEUE
-
#include <sys/sysctl.h>
#include <sys/types.h>
#include <sys/event.h>
@@ -127,28 +125,3 @@ void uv__fs_event_destroy(uv_fs_event_t* handle) {
close(handle->fd);
handle->fd = -1;
}
-
-#else /* !HAVE_KQUEUE */
-
-int uv_fs_event_init(uv_loop_t* loop,
- uv_fs_event_t* handle,
- const char* filename,
- uv_fs_event_cb cb,
- int flags) {
- loop->counters.fs_event_init++;
- uv__set_sys_error(loop, ENOSYS);
- return -1;
-}
-
-
-void uv__fs_event_destroy(uv_fs_event_t* handle) {
- UNREACHABLE();
-}
-
-
-/* Called by libev, don't touch. */
-void uv__kqueue_hack(EV_P_ int fflags, ev_io *w) {
- UNREACHABLE();
-}
-
-#endif /* HAVE_KQUEUE */

0 comments on commit 56bb4c2

Please sign in to comment.