Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
1a8d7cd9
Commit
1a8d7cd9
authored
Jul 24, 2018
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
e8f5d219
ab1d5fe1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/zmalloc.c
View file @
1a8d7cd9
...
@@ -183,7 +183,7 @@ size_t zmalloc_size(void *ptr) {
...
@@ -183,7 +183,7 @@ size_t zmalloc_size(void *ptr) {
return
size
+
PREFIX_SIZE
;
return
size
+
PREFIX_SIZE
;
}
}
size_t
zmalloc_usable
(
void
*
ptr
)
{
size_t
zmalloc_usable
(
void
*
ptr
)
{
return
zmalloc_
usabl
e
(
ptr
)
-
PREFIX_SIZE
;
return
zmalloc_
siz
e
(
ptr
)
-
PREFIX_SIZE
;
}
}
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment