Skip to content

Commit 6bec544

Browse files
piscisaureuspiscisaureus
committed
uv: upgrade to 8073a26
1 parent 772b3bf commit 6bec544

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2625
-1525
lines changed

‎deps/uv/config-unix.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ OBJS += src/unix/loop-watcher.o
3737
OBJS += src/unix/pipe.o
3838
OBJS += src/unix/poll.o
3939
OBJS += src/unix/process.o
40+
OBJS += src/unix/signal.o
4041
OBJS += src/unix/stream.o
4142
OBJS += src/unix/tcp.o
4243
OBJS += src/unix/thread.o

‎deps/uv/gyp_uv‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ def compiler_version():
2222
proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
2323
is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
2424
proc = subprocess.Popen(CC.split() + ['-dumpversion'], stdout=subprocess.PIPE)
25-
version = tuple(map(int, proc.communicate()[0].split('.')))
25+
version = proc.communicate()[0].split('.')
26+
version = map(int, version[:2])
27+
version = tuple(version)
2628
return (version, is_clang)
2729

2830

‎deps/uv/include/uv-private/eio.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ struct eio_req
251251

252252
eio_channel *channel; /* data used to direct poll callbacks arising from this req */
253253

254-
#if __i386 || __amd64
254+
#if defined(__i386) || defined(__amd64)
255255
unsigned char cancelled;
256256
#else
257257
sig_atomic_t cancelled;

‎deps/uv/include/uv-private/ngx-queue.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct ngx_queue_s {
6262
(q)->prev
6363

6464

65-
#if (NGX_DEBUG)
65+
#if defined(NGX_DEBUG)
6666

6767
#define ngx_queue_remove(x) \
6868
(x)->next->prev = (x)->prev; \

‎deps/uv/include/uv-private/uv-bsd.h‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy
4+
* of this software and associated documentation files (the "Software"), to
5+
* deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
* sell copies of the Software, and to permit persons to whom the Software is
8+
* furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in
11+
* all copies or substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19+
* IN THE SOFTWARE.
20+
*/
21+
22+
#ifndef UV_BSD_H
23+
#define UV_BSD_H
24+
25+
#define UV_PLATFORM_FS_EVENT_FIELDS \
26+
uv__io_t event_watcher; \
27+
int fflags; \
28+
int fd; \
29+
30+
#endif /* UV_BSD_H */

‎deps/uv/include/uv-private/uv-darwin.h‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy
4+
* of this software and associated documentation files (the "Software"), to
5+
* deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
* sell copies of the Software, and to permit persons to whom the Software is
8+
* furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in
11+
* all copies or substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19+
* IN THE SOFTWARE.
20+
*/
21+
22+
#ifndef UV_DARWIN_H
23+
#define UV_DARWIN_H
24+
25+
#if defined(__APPLE__) && defined(__MACH__)
26+
# include <mach/mach.h>
27+
# include <mach/task.h>
28+
# include <mach/semaphore.h>
29+
# define UV_PLATFORM_SEM_T semaphore_t
30+
#endif
31+
32+
#define UV_PLATFORM_FS_EVENT_FIELDS \
33+
ev_io event_watcher; \
34+
int fflags; \
35+
int fd; \
36+
37+
#endif /* UV_DARWIN_H */

‎deps/uv/include/uv-private/uv-linux.h‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy
4+
* of this software and associated documentation files (the "Software"), to
5+
* deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
* sell copies of the Software, and to permit persons to whom the Software is
8+
* furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in
11+
* all copies or substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19+
* IN THE SOFTWARE.
20+
*/
21+
22+
#ifndef UV_LINUX_H
23+
#define UV_LINUX_H
24+
25+
#define UV_PLATFORM_LOOP_FIELDS \
26+
uv__io_t inotify_read_watcher; \
27+
void* inotify_watchers; \
28+
int inotify_fd; \
29+
30+
#define UV_PLATFORM_FS_EVENT_FIELDS \
31+
ngx_queue_t watchers; \
32+
int wd; \
33+
34+
#endif /* UV_LINUX_H */

‎deps/uv/include/uv-private/uv-sunos.h‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy
4+
* of this software and associated documentation files (the "Software"), to
5+
* deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
* sell copies of the Software, and to permit persons to whom the Software is
8+
* furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in
11+
* all copies or substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19+
* IN THE SOFTWARE.
20+
*/
21+
22+
#ifndef UV_SUNOS_H
23+
#define UV_SUNOS_H
24+
25+
#include <sys/port.h>
26+
#include <port.h>
27+
28+
#if defined(PORT_SOURCE_FILE)
29+
30+
# define UV_PLATFORM_LOOP_FIELDS \
31+
uv__io_t fs_event_watcher; \
32+
int fs_fd; \
33+
34+
# define UV_PLATFORM_FS_EVENT_FIELDS \
35+
file_obj_t fo; \
36+
int fd; \
37+
38+
#endif /* defined(PORT_SOURCE_FILE) */
39+
40+
#endif /* UV_SUNOS_H */

0 commit comments

Comments
 (0)