Commit 24accab2 authored by antirez's avatar antirez
Browse files

Merge remote-tracking branch 'origin/unstable' into unstable

parents 18d0ef4b 36dda955
...@@ -13,7 +13,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) { ...@@ -13,7 +13,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
aeApiState *state = zmalloc(sizeof(aeApiState)); aeApiState *state = zmalloc(sizeof(aeApiState));
if (!state) return -1; if (!state) return -1;
state->events = zmalloc(sizeof(epoll_event)*eventLoop->setsize); state->events = zmalloc(sizeof(struct epoll_event)*eventLoop->setsize);
if (!state->events) { if (!state->events) {
zfree(state); zfree(state);
return -1; return -1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment