Browse files

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

  • Loading branch information...
2 parents da67b5f + 9738e58 commit d526d09e414e8a79fe97d34d48a4af1e45bfbc69 @antirez committed Jan 20, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/zmalloc.c
View
2 src/zmalloc.c
@@ -262,7 +262,7 @@ size_t zmalloc_get_rss(void) {
return t_info.resident_size;
}
#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
* return the memory usage we estimated in zmalloc()..
*

0 comments on commit d526d09

Please sign in to comment.