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

This commit is contained in:
antirez 2011-12-16 09:56:12 +01:00
commit 24accab2aa

View File

@ -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;