diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-09-24 13:45:57 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-09-24 13:46:19 -0700 |
| commit | 55546f55d44522a4ecac67ee040e4059b5bf06b0 (patch) | |
| tree | 76e217ed38a60e2f31e94574b60b7b154106d0b7 /deps/uv | |
| parent | 35ae69682253ea51e59610a9a9e132c78f5e71d5 (diff) | |
| download | node-55546f55d44522a4ecac67ee040e4059b5bf06b0.tar.gz | |
uv: Upgrade to v0.10.17
Diffstat (limited to 'deps/uv')
| -rw-r--r-- | deps/uv/ChangeLog | 11 | ||||
| -rw-r--r-- | deps/uv/common.gypi | 1 | ||||
| -rw-r--r-- | deps/uv/src/unix/fsevents.c | 37 | ||||
| -rw-r--r-- | deps/uv/src/version.c | 2 |
4 files changed, 32 insertions, 19 deletions
diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog index bcfc1dfff..98fb44f97 100644 --- a/deps/uv/ChangeLog +++ b/deps/uv/ChangeLog @@ -1,4 +1,13 @@ -2013.09.06, Version 0.10.16 (Stable) +2013.09.25, Version 0.10.17 (Stable) + +Changes since version 0.10.16: + +* build: remove GCC_WARN_ABOUT_MISSING_NEWLINE (Ben Noordhuis) + +* darwin: fix 10.6 build error in fsevents.c (Ben Noordhuis) + + +2013.09.06, Version 0.10.16 (Stable), 2bce230d81f4853a23662cbeb26fe98010b1084b Changes since version 0.10.15: diff --git a/deps/uv/common.gypi b/deps/uv/common.gypi index 67291fdc1..4b240d98f 100644 --- a/deps/uv/common.gypi +++ b/deps/uv/common.gypi @@ -171,7 +171,6 @@ 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics - 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof 'PREBINDING': 'NO', # No -Wl,-prebind 'USE_HEADERMAP': 'NO', 'OTHER_CFLAGS': [ diff --git a/deps/uv/src/unix/fsevents.c b/deps/uv/src/unix/fsevents.c index f849c38f3..7636b80ce 100644 --- a/deps/uv/src/unix/fsevents.c +++ b/deps/uv/src/unix/fsevents.c @@ -46,6 +46,27 @@ void uv__fsevents_loop_delete(uv_loop_t* loop) { #include <CoreFoundation/CFRunLoop.h> #include <CoreServices/CoreServices.h> +/* These are macros to avoid "initializer element is not constant" errors + * with old versions of gcc. + */ +#define kFSEventsModified (kFSEventStreamEventFlagItemFinderInfoMod | \ + kFSEventStreamEventFlagItemModified | \ + kFSEventStreamEventFlagItemInodeMetaMod | \ + kFSEventStreamEventFlagItemChangeOwner | \ + kFSEventStreamEventFlagItemXattrMod) + +#define kFSEventsRenamed (kFSEventStreamEventFlagItemCreated | \ + kFSEventStreamEventFlagItemRemoved | \ + kFSEventStreamEventFlagItemRenamed) + +#define kFSEventsSystem (kFSEventStreamEventFlagUserDropped | \ + kFSEventStreamEventFlagKernelDropped | \ + kFSEventStreamEventFlagEventIdsWrapped | \ + kFSEventStreamEventFlagHistoryDone | \ + kFSEventStreamEventFlagMount | \ + kFSEventStreamEventFlagUnmount | \ + kFSEventStreamEventFlagRootChanged) + typedef struct uv__fsevents_event_s uv__fsevents_event_t; typedef struct uv__cf_loop_signal_s uv__cf_loop_signal_t; typedef struct uv__cf_loop_state_s uv__cf_loop_state_t; @@ -72,22 +93,6 @@ struct uv__fsevents_event_s { char path[1]; }; -static const int kFSEventsModified = kFSEventStreamEventFlagItemFinderInfoMod | - kFSEventStreamEventFlagItemModified | - kFSEventStreamEventFlagItemInodeMetaMod | - kFSEventStreamEventFlagItemChangeOwner | - kFSEventStreamEventFlagItemXattrMod; -static const int kFSEventsRenamed = kFSEventStreamEventFlagItemCreated | - kFSEventStreamEventFlagItemRemoved | - kFSEventStreamEventFlagItemRenamed; -static const int kFSEventsSystem = kFSEventStreamEventFlagUserDropped | - kFSEventStreamEventFlagKernelDropped | - kFSEventStreamEventFlagEventIdsWrapped | - kFSEventStreamEventFlagHistoryDone | - kFSEventStreamEventFlagMount | - kFSEventStreamEventFlagUnmount | - kFSEventStreamEventFlagRootChanged; - /* Forward declarations */ static void uv__cf_loop_cb(void* arg); static void* uv__cf_loop_runner(void* arg); diff --git a/deps/uv/src/version.c b/deps/uv/src/version.c index 1cd43837e..548960179 100644 --- a/deps/uv/src/version.c +++ b/deps/uv/src/version.c @@ -34,7 +34,7 @@ #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 -#define UV_VERSION_PATCH 16 +#define UV_VERSION_PATCH 17 #define UV_VERSION_IS_RELEASE 1 |