diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-07-03 20:54:19 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-07-03 20:56:26 +0200 |
| commit | 5da78905a6c82aa40f79ae8ff1a74a53bc89a588 (patch) | |
| tree | b9869d86902934b2c0c093ec92c5a64df3d56e1b /deps/uv | |
| parent | b1cce046467f7fb64710160c5122a7883b739729 (diff) | |
| download | node-5da78905a6c82aa40f79ae8ff1a74a53bc89a588.tar.gz | |
deps: upgrade libuv to 5031a5b
Diffstat (limited to 'deps/uv')
| -rw-r--r-- | deps/uv/config-unix.mk | 4 | ||||
| -rw-r--r-- | deps/uv/src/unix/linux/linux-core.c (renamed from deps/uv/src/unix/linux/core.c) | 0 | ||||
| -rw-r--r-- | deps/uv/uv.gyp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/deps/uv/config-unix.mk b/deps/uv/config-unix.mk index 7220f108a..0581b5114 100644 --- a/deps/uv/config-unix.mk +++ b/deps/uv/config-unix.mk @@ -67,7 +67,9 @@ EIO_CONFIG=config_linux.h CSTDFLAG += -D_GNU_SOURCE CPPFLAGS += -Isrc/ares/config_linux LINKFLAGS+=-ldl -lrt -OBJS += src/unix/linux/core.o src/unix/linux/inotify.o src/unix/linux/syscalls.o +OBJS += src/unix/linux/linux-core.o \ + src/unix/linux/inotify.o \ + src/unix/linux/syscalls.o endif ifeq (FreeBSD,$(uname_S)) diff --git a/deps/uv/src/unix/linux/core.c b/deps/uv/src/unix/linux/linux-core.c index 34f48a94b..34f48a94b 100644 --- a/deps/uv/src/unix/linux/core.c +++ b/deps/uv/src/unix/linux/linux-core.c diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp index 0fa50338c..96c6b724c 100644 --- a/deps/uv/uv.gyp +++ b/deps/uv/uv.gyp @@ -233,7 +233,7 @@ [ 'OS=="linux"', { 'include_dirs': [ 'src/ares/config_linux' ], 'sources': [ - 'src/unix/linux/core.c', + 'src/unix/linux/linux-core.c', 'src/unix/linux/inotify.c', 'src/unix/linux/syscalls.c', 'src/unix/linux/syscalls.h', |