From: antirez <antirez@gmail.com>
Date: Fri, 16 Dec 2011 08:56:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into unstable
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/24accab2aa62f6ed1b87c6178f2003e37f0adbfd?hp=18d0ef4bf010282832e9f4c697a86218fc70f393

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

diff --git a/src/ae_epoll.c b/src/ae_epoll.c
index fc6d9ccd..cac10d67 100644
--- a/src/ae_epoll.c
+++ b/src/ae_epoll.c
@@ -13,7 +13,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
     aeApiState *state = zmalloc(sizeof(aeApiState));
 
     if (!state) return -1;
-    state->events = zmalloc(sizeof(epoll_event)*eventLoop->setsize);
+    state->events = zmalloc(sizeof(struct epoll_event)*eventLoop->setsize);
     if (!state->events) {
         zfree(state);
         return -1;