uv: Cherry-pick joyent/libuv@3c41597

4 files changed, 26 insertions, 29 deletions

diff --git a/deps/uv/include/uv-private/uv-unix.h b/deps/uv/include/uv-private/uv-unix.h
index 798be5e0e7..bb8e5d6b9b 100644
--- a/deps/uv/include/uv-private/uv-unix.h
+++ b/deps/uv/include/uv-private/uv-unix.h
@@ -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__)
diff --git a/deps/uv/src/unix/ev/ev_kqueue.c b/deps/uv/src/unix/ev/ev_kqueue.c
index f03cb8083d..871e771bc2 100644
--- a/deps/uv/src/unix/ev/ev_kqueue.c
+++ b/deps/uv/src/unix/ev/ev_kqueue.c
@@ -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);
 
diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h
index 3cc086f265..bd2ee0ffd3 100644
--- a/deps/uv/src/unix/internal.h
+++ b/deps/uv/src/unix/internal.h
@@ -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__)
diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
index 58988f9d1b..ec3ba32e82 100644
--- a/deps/uv/src/unix/kqueue.c
+++ b/deps/uv/src/unix/kqueue.c
@@ -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 */