Commit dc18a6a6 authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:/antirez/redis into unstable

parents 5e176e1a ae4f5b30
...@@ -100,7 +100,7 @@ typedef void (*RedisModuleTypeFreeFunc)(void *value); ...@@ -100,7 +100,7 @@ typedef void (*RedisModuleTypeFreeFunc)(void *value);
void *REDISMODULE_API_FUNC(RedisModule_Alloc)(size_t bytes); void *REDISMODULE_API_FUNC(RedisModule_Alloc)(size_t bytes);
void *REDISMODULE_API_FUNC(RedisModule_Realloc)(void *ptr, size_t bytes); void *REDISMODULE_API_FUNC(RedisModule_Realloc)(void *ptr, size_t bytes);
void REDISMODULE_API_FUNC(RedisModule_Free)(void *ptr); void REDISMODULE_API_FUNC(RedisModule_Free)(void *ptr);
void REDISMODULE_API_FUNC(RedisModule_Calloc)(size_t nmemb, size_t size); void *REDISMODULE_API_FUNC(RedisModule_Calloc)(size_t nmemb, size_t size);
char *REDISMODULE_API_FUNC(RedisModule_Strdup)(const char *str); char *REDISMODULE_API_FUNC(RedisModule_Strdup)(const char *str);
int REDISMODULE_API_FUNC(RedisModule_GetApi)(const char *, void *); int REDISMODULE_API_FUNC(RedisModule_GetApi)(const char *, void *);
int REDISMODULE_API_FUNC(RedisModule_CreateCommand)(RedisModuleCtx *ctx, const char *name, RedisModuleCmdFunc cmdfunc, const char *strflags, int firstkey, int lastkey, int keystep); int REDISMODULE_API_FUNC(RedisModule_CreateCommand)(RedisModuleCtx *ctx, const char *name, RedisModuleCmdFunc cmdfunc, const char *strflags, int firstkey, int lastkey, int keystep);
......
...@@ -3825,7 +3825,7 @@ void setupSignalHandlers(void) { ...@@ -3825,7 +3825,7 @@ void setupSignalHandlers(void) {
void memtest(size_t megabytes, int passes); void memtest(size_t megabytes, int passes);
/* Returns 1 if there is --sentinel among the arguments or if /* Returns 1 if there is --sentinel among the arguments or if
* argv[0] is exactly "redis-sentinel". */ * argv[0] contains "redis-sentinel". */
int checkForSentinelMode(int argc, char **argv) { int checkForSentinelMode(int argc, char **argv) {
int j; int j;
......
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