projects
/
redis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix for ZUNIONSTORE bug when there is an empty set among input sets. Regression test...
[redis.git]
/
src
/
zmalloc.c
diff --git
a/src/zmalloc.c
b/src/zmalloc.c
index b438017dc7c3b7fad6994e8bd2ffae7ca7bbdb5d..aa3ccfe963d8fa6e67eacca70dc2ce953b973c27 100644
(file)
--- a/
src/zmalloc.c
+++ b/
src/zmalloc.c
@@
-262,7
+262,7
@@
size_t zmalloc_get_rss(void) {
return t_info.resident_size;
}
#else
-
floa
t 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()..
*