Skip to content

Commit 55546f5

Browse files
committed
uv: Upgrade to v0.10.17
1 parent 35ae696 commit 55546f5

4 files changed

Lines changed: 32 additions & 19 deletions

File tree

deps/uv/ChangeLog

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
2013.09.06, Version 0.10.16 (Stable)
1+
2013.09.25, Version 0.10.17 (Stable)
2+
3+
Changes since version 0.10.16:
4+
5+
* build: remove GCC_WARN_ABOUT_MISSING_NEWLINE (Ben Noordhuis)
6+
7+
* darwin: fix 10.6 build error in fsevents.c (Ben Noordhuis)
8+
9+
10+
2013.09.06, Version 0.10.16 (Stable), 2bce230d81f4853a23662cbeb26fe98010b1084b
211

312
Changes since version 0.10.15:
413

deps/uv/common.gypi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
172172
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
173173
'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
174-
'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof
175174
'PREBINDING': 'NO', # No -Wl,-prebind
176175
'USE_HEADERMAP': 'NO',
177176
'OTHER_CFLAGS': [

deps/uv/src/unix/fsevents.c

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,27 @@ void uv__fsevents_loop_delete(uv_loop_t* loop) {
4646
#include <CoreFoundation/CFRunLoop.h>
4747
#include <CoreServices/CoreServices.h>
4848

49+
/* These are macros to avoid "initializer element is not constant" errors
50+
* with old versions of gcc.
51+
*/
52+
#define kFSEventsModified (kFSEventStreamEventFlagItemFinderInfoMod | \
53+
kFSEventStreamEventFlagItemModified | \
54+
kFSEventStreamEventFlagItemInodeMetaMod | \
55+
kFSEventStreamEventFlagItemChangeOwner | \
56+
kFSEventStreamEventFlagItemXattrMod)
57+
58+
#define kFSEventsRenamed (kFSEventStreamEventFlagItemCreated | \
59+
kFSEventStreamEventFlagItemRemoved | \
60+
kFSEventStreamEventFlagItemRenamed)
61+
62+
#define kFSEventsSystem (kFSEventStreamEventFlagUserDropped | \
63+
kFSEventStreamEventFlagKernelDropped | \
64+
kFSEventStreamEventFlagEventIdsWrapped | \
65+
kFSEventStreamEventFlagHistoryDone | \
66+
kFSEventStreamEventFlagMount | \
67+
kFSEventStreamEventFlagUnmount | \
68+
kFSEventStreamEventFlagRootChanged)
69+
4970
typedef struct uv__fsevents_event_s uv__fsevents_event_t;
5071
typedef struct uv__cf_loop_signal_s uv__cf_loop_signal_t;
5172
typedef struct uv__cf_loop_state_s uv__cf_loop_state_t;
@@ -72,22 +93,6 @@ struct uv__fsevents_event_s {
7293
char path[1];
7394
};
7495

75-
static const int kFSEventsModified = kFSEventStreamEventFlagItemFinderInfoMod |
76-
kFSEventStreamEventFlagItemModified |
77-
kFSEventStreamEventFlagItemInodeMetaMod |
78-
kFSEventStreamEventFlagItemChangeOwner |
79-
kFSEventStreamEventFlagItemXattrMod;
80-
static const int kFSEventsRenamed = kFSEventStreamEventFlagItemCreated |
81-
kFSEventStreamEventFlagItemRemoved |
82-
kFSEventStreamEventFlagItemRenamed;
83-
static const int kFSEventsSystem = kFSEventStreamEventFlagUserDropped |
84-
kFSEventStreamEventFlagKernelDropped |
85-
kFSEventStreamEventFlagEventIdsWrapped |
86-
kFSEventStreamEventFlagHistoryDone |
87-
kFSEventStreamEventFlagMount |
88-
kFSEventStreamEventFlagUnmount |
89-
kFSEventStreamEventFlagRootChanged;
90-
9196
/* Forward declarations */
9297
static void uv__cf_loop_cb(void* arg);
9398
static void* uv__cf_loop_runner(void* arg);

deps/uv/src/version.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
#define UV_VERSION_MAJOR 0
3636
#define UV_VERSION_MINOR 10
37-
#define UV_VERSION_PATCH 16
37+
#define UV_VERSION_PATCH 17
3838
#define UV_VERSION_IS_RELEASE 1
3939

4040

0 commit comments

Comments
 (0)