diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2021-03-02 15:14:00 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2021-03-02 15:14:00 +0000 |
| commit | 71f8418a9cff2f28738a7ffffdee448220b708d8 (patch) | |
| tree | 3840b686143d305f1fb469b607dee9d6402c2393 /databases/redis/files | |
| parent | sysutils/nvimpager: Remove errant ectopic patch file (diff) | |
Update from 6.0.11 to 6.0.12.
Remove added to the upstream patch.
<ChangeLog>
================================================================================
Redis 6.0.12 Released Mon Mar 1 17:29:52 IST 2021
================================================================================
Upgrade urgency: LOW, fixes a compilation issue.
Bug fixes:
* Fix compilation error on non-glibc systems if jemalloc is not used (#8533)
</ChangeLog>
Notes
Notes:
svn path=/head/; revision=566964
Diffstat (limited to 'databases/redis/files')
| -rw-r--r-- | databases/redis/files/patch-src-zmalloc.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/databases/redis/files/patch-src-zmalloc.c b/databases/redis/files/patch-src-zmalloc.c deleted file mode 100644 index 20ac72c2e621..000000000000 --- a/databases/redis/files/patch-src-zmalloc.c +++ /dev/null @@ -1,30 +0,0 @@ ---- src/zmalloc.c.orig 2021-02-23 11:09:32.095861000 -0500 -+++ src/zmalloc.c 2021-02-23 11:20:04.491174000 -0500 -@@ -40,6 +40,7 @@ - free(ptr); - } - -+#include <assert.h> - #include <string.h> - #include <pthread.h> - #include "config.h" -@@ -48,18 +49,14 @@ - - #ifdef HAVE_MALLOC_SIZE - #define PREFIX_SIZE (0) -+#define ASSERT_NO_SIZE_OVERFLOW(sz) - #else - #if defined(__sun) || defined(__sparc) || defined(__sparc__) - #define PREFIX_SIZE (sizeof(long long)) - #else - #define PREFIX_SIZE (sizeof(size_t)) - #endif --#endif -- --#if PREFIX_SIZE > 0 - #define ASSERT_NO_SIZE_OVERFLOW(sz) assert((sz) + PREFIX_SIZE > (sz)) --#else --#define ASSERT_NO_SIZE_OVERFLOW(sz) - #endif - - /* Explicitly override malloc/free etc when using tcmalloc. */ |