Former-commit-id: 6c410af5a89aa9c11df67e04d1cfbde55aa7fe90
This commit is contained in:
John Sully 2019-05-09 19:14:10 -04:00
parent 57539d2ce4
commit b57a72fa2c
2 changed files with 10 additions and 7 deletions

View File

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#define NO_DEPRECATE_FREE 1 // we are required to call the real free() in this CU
#include "server.h" #include "server.h"
#include "sha1.h" /* SHA1 is used for DEBUG DIGEST */ #include "sha1.h" /* SHA1 is used for DEBUG DIGEST */
#include "crc64.h" #include "crc64.h"

View File

@ -2466,13 +2466,15 @@ struct redisMaster *MasterInfoFromClient(client *c);
uint64_t getMvccTstamp(); uint64_t getMvccTstamp();
void incrementMvccTstamp(); void incrementMvccTstamp();
#if defined(__GNUC__) #if defined(__GNUC__) && !defined(NO_DEPRECATE_FREE)
#ifndef __cplusplus [[deprecated]]
void *calloc(size_t count, size_t size) __attribute__ ((deprecated)); void *calloc(size_t count, size_t size);
void free(void *ptr) __attribute__ ((deprecated)); [[deprecated]]
void *malloc(size_t size) __attribute__ ((deprecated)); void free(void *ptr);
void *realloc(void *ptr, size_t size) __attribute__ ((deprecated)); [[deprecated]]
#endif void *malloc(size_t size);
[[deprecated]]
void *realloc(void *ptr, size_t size);
#endif #endif
/* Debugging stuff */ /* Debugging stuff */