diff options
| author | antirez <antirez@gmail.com> | 2016-06-10 09:00:02 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2016-06-10 09:00:02 +0200 |
| commit | 54813368729009fb599701565036bf2dd89fcfd4 (patch) | |
| tree | 01f3ad9cd28076ae6948980034c66abd94909aca /src | |
| parent | b664aebda176ae8ac7e1a5284370164a89348b2d (diff) | |
| parent | 53c008a78591fbca6dcac9faf82e61eb784e42f1 (diff) | |
| download | redis-54813368729009fb599701565036bf2dd89fcfd4.tar.gz | |
Merge branch 'unstable' of github.com:/antirez/redis into unstable
Diffstat (limited to 'src')
| -rw-r--r-- | src/ae_select.c | 1 | ||||
| -rw-r--r-- | src/redismodule.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/ae_select.c b/src/ae_select.c index e2b7a9e8a..c039a8ea3 100644 --- a/src/ae_select.c +++ b/src/ae_select.c @@ -29,6 +29,7 @@ */ +#include <sys/select.h> #include <string.h> typedef struct aeApiState { diff --git a/src/redismodule.h b/src/redismodule.h index 0327487f3..618b39e49 100644 --- a/src/redismodule.h +++ b/src/redismodule.h @@ -182,6 +182,7 @@ void REDISMODULE_API_FUNC(RedisModule_SaveDouble)(RedisModuleIO *io, double valu double REDISMODULE_API_FUNC(RedisModule_LoadDouble)(RedisModuleIO *io); /* This is included inline inside each Redis module. */ +static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int apiver) __attribute__((unused)); static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int apiver) { void *getapifuncptr = ((void**)ctx)[0]; RedisModule_GetApi = (int (*)(const char *, void *)) (unsigned long)getapifuncptr; |