Skip to content

Commit fcba145

Browse files
committed
uv: upgrade to 8f617b9
1 parent 43cb4ec commit fcba145

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

deps/uv/README.md

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,37 @@ http://nodejs.org/
88

99
## Features
1010

11-
Implemented Features:
11+
Implemented:
1212

13-
* Non-blocking sockets and pipes
13+
* Non-blocking TCP sockets
1414

15-
* Timers
15+
* Non-blocking named pipes
1616

1717
* UDP
1818

19+
* Timers
20+
1921
* Child process spawning
2022

21-
* Asynchronous DNS via c-ares or getaddrinfo.
23+
* Asynchronous DNS via c-ares or `uv_getaddrinfo`.
2224

23-
* Asynchronous file system APIs (uv_fs_*)
25+
* Asynchronous file system APIs `uv_fs_*`
2426

25-
* High resolution time (uv_hrtime)
27+
* High resolution time `uv_hrtime`
2628

27-
* Current executable path look up (uv_exepath)
29+
* Current executable path look up `uv_exepath`
2830

29-
* Thread pool scheduling (uv_queue_work)
31+
* Thread pool scheduling `uv_queue_work`
3032

31-
Work in progress:
33+
In-progress:
3234

33-
* File system events (Currently supports inotify, ReadDirectoryChangesW and
34-
will support kqueue and event ports in the near future.)
35+
* File system events (Currently supports inotify, `ReadDirectoryChangesW`
36+
and will support kqueue and event ports in the near future.)
37+
`uv_fs_event_t`
3538

36-
* TTY support (with VT100 emulation on Windows - work in progress)
39+
* VT100 TTY `uv_tty_t`
3740

38-
* Socket sharing between processes
41+
* Socket sharing between processes `uv_ipc_t`
3942

4043

4144
## Documentation
@@ -58,7 +61,7 @@ To build with Visual Studio run the vcbuilds.bat file which will
5861
checkout the GYP code into build/gyp and generate the uv.sln and
5962
related files.
6063

61-
Windows users can also build from cmd-line using msbuild. This is
64+
Windows users can also build from cmd-line using msbuild. This is
6265
done by running vcbuild.bat from Visual Studio command prompt.
6366

6467
To have GYP generate build script for another system you will need to

deps/uv/src/unix/fs.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,11 @@ int uv_fs_fsync(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) {
447447

448448
int uv_fs_fdatasync(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) {
449449
char* path = NULL;
450-
#ifdef __FreeBSD__
451-
/* freebsd doesn't have fdatasync, do a full fsync instead. */
450+
#if defined(__FreeBSD__) \
451+
|| (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060)
452+
/* freebsd and pre-10.6 darwin don't have fdatasync,
453+
* do a full fsync instead.
454+
*/
452455
WRAP_EIO(UV_FS_FDATASYNC, eio_fdatasync, fsync, ARGS1(file))
453456
#else
454457
WRAP_EIO(UV_FS_FDATASYNC, eio_fdatasync, fdatasync, ARGS1(file))

0 commit comments

Comments
 (0)