Commit d526d09e authored by antirez's avatar antirez
Browse files

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

parents da67b5f5 9738e587
...@@ -262,7 +262,7 @@ size_t zmalloc_get_rss(void) { ...@@ -262,7 +262,7 @@ size_t zmalloc_get_rss(void) {
return t_info.resident_size; return t_info.resident_size;
} }
#else #else
float zmalloc_get_rss(void) { size_t zmalloc_get_rss(void) {
/* If we can't get the RSS in an OS-specific way for this system just /* If we can't get the RSS in an OS-specific way for this system just
* return the memory usage we estimated in zmalloc().. * return the memory usage we estimated in zmalloc()..
* *
......
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