fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-30 04:52:13 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
antirez 2011-01-20 16:50:02 +01:00
commit d526d09e41
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zmalloc.c
View File

@ -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()..
* *