diff options
| author | michael-grunder <michael.grunder@gmail.com> | 2020-08-15 12:24:31 -0700 |
|---|---|---|
| committer | Yossi Gottlieb <yossigo@gmail.com> | 2022-02-14 14:00:57 +0200 |
| commit | 47400870ae25a62aa6fa85e9c26af1c357a44b79 (patch) | |
| tree | 456d3ccb604a27871a0e1c87298d71a3db9d382e /deps/hiredis/sdsalloc.h | |
| parent | 886a04c2c3899611b352e87070aa874e321f9034 (diff) | |
| download | redis-47400870ae25a62aa6fa85e9c26af1c357a44b79.tar.gz | |
Reapply: Rename sds calls so they don't conflict.
Reapply this commit on top of hiredis as a local change. Previosuly it
was pulled from a private hiredis branch, which resulted with it going
away on subtree pull.
Diffstat (limited to 'deps/hiredis/sdsalloc.h')
| -rw-r--r-- | deps/hiredis/sdsalloc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/hiredis/sdsalloc.h b/deps/hiredis/sdsalloc.h index 5538dd94c..c9dcc3df8 100644 --- a/deps/hiredis/sdsalloc.h +++ b/deps/hiredis/sdsalloc.h @@ -39,6 +39,6 @@ #include "alloc.h" -#define s_malloc hi_malloc -#define s_realloc hi_realloc -#define s_free hi_free +#define hi_s_malloc hi_malloc +#define hi_s_realloc hi_realloc +#define hi_s_free hi_free |