summaryrefslogtreecommitdiff
path: root/deps/uv/src/unix/internal.h
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2013-08-21 11:15:21 -0700
committerTimothy J Fontaine <tjfontaine@gmail.com>2013-08-21 11:15:21 -0700
commita784abaff631449533d44846987c1537c080e03d (patch)
tree0982d9a92450edb9e46ba683d75eb7822ea004b3 /deps/uv/src/unix/internal.h
parent41f55dc59b423b8b76e6f7971fd8f3a326a6fbad (diff)
downloadandroid-node-v8-a784abaff631449533d44846987c1537c080e03d.tar.gz
android-node-v8-a784abaff631449533d44846987c1537c080e03d.tar.bz2
android-node-v8-a784abaff631449533d44846987c1537c080e03d.zip
uv: Upgrade to v0.11.8
Diffstat (limited to 'deps/uv/src/unix/internal.h')
-rw-r--r--deps/uv/src/unix/internal.h31
1 files changed, 21 insertions, 10 deletions
diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h
index 2c4e3e918d..8559e33185 100644
--- a/deps/uv/src/unix/internal.h
+++ b/deps/uv/src/unix/internal.h
@@ -39,7 +39,6 @@
#if defined(__sun)
# include <sys/port.h>
# include <port.h>
-# define futimes(fd, tv) futimesat(fd, (void*)0, tv)
#endif /* __sun */
#if defined(__APPLE__) && !TARGET_OS_IPHONE
@@ -67,6 +66,21 @@
} \
while (0)
+/* The __clang__ and __INTEL_COMPILER checks are superfluous because they
+ * define __GNUC__. They are here to convey to you, dear reader, that these
+ * macros are enabled when compiling with clang or icc.
+ */
+#if defined(__clang__) || \
+ defined(__GNUC__) || \
+ defined(__INTEL_COMPILER) || \
+ defined(__SUNPRO_C)
+# define UV_DESTRUCTOR(declaration) __attribute__((destructor)) declaration
+# define UV_UNUSED(declaration) __attribute__((unused)) declaration
+#else
+# define UV_DESTRUCTOR(declaration) declaration
+# define UV_UNUSED(declaration) declaration
+#endif
+
#if defined(__linux__)
# define UV__POLLIN UV__EPOLLIN
# define UV__POLLOUT UV__EPOLLOUT
@@ -215,12 +229,10 @@ int uv__make_socketpair(int fds[2], int flags);
int uv__make_pipe(int fds[2], int flags);
#if defined(__APPLE__)
-typedef void (*cf_loop_signal_cb)(void*);
-
-void uv__cf_loop_signal(uv_loop_t* loop, cf_loop_signal_cb cb, void* arg);
int uv__fsevents_init(uv_fs_event_t* handle);
int uv__fsevents_close(uv_fs_event_t* handle);
+void uv__fsevents_loop_delete(uv_loop_t* loop);
/* OSX < 10.7 has no file events, polyfill them */
#ifndef MAC_OS_X_VERSION_10_7
@@ -242,21 +254,20 @@ static const int kFSEventStreamEventFlagItemIsSymlink = 0x00040000;
#endif /* defined(__APPLE__) */
-__attribute__((unused))
-static void uv__req_init(uv_loop_t* loop, uv_req_t* req, uv_req_type type) {
+UV_UNUSED(static void uv__req_init(uv_loop_t* loop,
+ uv_req_t* req,
+ uv_req_type type)) {
req->type = type;
uv__req_register(loop, req);
}
#define uv__req_init(loop, req, type) \
uv__req_init((loop), (uv_req_t*)(req), (type))
-__attribute__((unused))
-static void uv__update_time(uv_loop_t* loop) {
+UV_UNUSED(static void uv__update_time(uv_loop_t* loop)) {
loop->time = uv__hrtime() / 1000000;
}
-__attribute__((unused))
-static char* uv__basename_r(const char* path) {
+UV_UNUSED(static char* uv__basename_r(const char* path)) {
char* s;
s = strrchr(path, '/');