summaryrefslogtreecommitdiff
path: root/deps/uv/src/unix/linux-core.c
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-03-29 16:10:56 +0100
committerBen Noordhuis <info@bnoordhuis.nl>2013-03-29 16:10:56 +0100
commit87f9ece334953bcf0f2d07811728df72cb572ea3 (patch)
tree495dcec91865d6feef451631b2d82f9d547e82fa /deps/uv/src/unix/linux-core.c
parent74ef94907277d8aa29d23cef29aee25161960376 (diff)
downloadandroid-node-v8-87f9ece334953bcf0f2d07811728df72cb572ea3.tar.gz
android-node-v8-87f9ece334953bcf0f2d07811728df72cb572ea3.tar.bz2
android-node-v8-87f9ece334953bcf0f2d07811728df72cb572ea3.zip
deps: upgrade libuv to c43e851
Diffstat (limited to 'deps/uv/src/unix/linux-core.c')
-rw-r--r--deps/uv/src/unix/linux-core.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c
index daab6f196a..23a5977279 100644
--- a/deps/uv/src/unix/linux-core.c
+++ b/deps/uv/src/unix/linux-core.c
@@ -101,7 +101,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
struct uv__epoll_event events[1024];
struct uv__epoll_event* pe;
struct uv__epoll_event e;
- ngx_queue_t* q;
+ QUEUE* q;
uv__io_t* w;
uint64_t base;
uint64_t diff;
@@ -113,16 +113,16 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
int i;
if (loop->nfds == 0) {
- assert(ngx_queue_empty(&loop->watcher_queue));
+ assert(QUEUE_EMPTY(&loop->watcher_queue));
return;
}
- while (!ngx_queue_empty(&loop->watcher_queue)) {
- q = ngx_queue_head(&loop->watcher_queue);
- ngx_queue_remove(q);
- ngx_queue_init(q);
+ while (!QUEUE_EMPTY(&loop->watcher_queue)) {
+ q = QUEUE_HEAD(&loop->watcher_queue);
+ QUEUE_REMOVE(q);
+ QUEUE_INIT(q);
- w = ngx_queue_data(q, uv__io_t, watcher_queue);
+ w = QUEUE_DATA(q, uv__io_t, watcher_queue);
assert(w->pevents != 0);
assert(w->fd >= 0);
assert(w->fd < (int) loop->nwatchers);