gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable

Browse Source 
Former-commit-id: c406e7ff51aa51f6e6d1ece9963fe2520a89fb6e
This commit is contained in:
John Sully 2019-03-19 01:26:22 -04:00
commit 571b2ab9de
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.h
View File

@ -2330,11 +2330,13 @@ void lolwutCommand(client *c);
void aclCommand(client *c); void aclCommand(client *c);
#if defined(__GNUC__) #if defined(__GNUC__)
#ifndef __cplusplus
void *calloc(size_t count, size_t size) __attribute__ ((deprecated)); void *calloc(size_t count, size_t size) __attribute__ ((deprecated));
void free(void *ptr) __attribute__ ((deprecated)); void free(void *ptr) __attribute__ ((deprecated));
void *malloc(size_t size) __attribute__ ((deprecated)); void *malloc(size_t size) __attribute__ ((deprecated));
void *realloc(void *ptr, size_t size) __attribute__ ((deprecated)); void *realloc(void *ptr, size_t size) __attribute__ ((deprecated));
#endif #endif
#endif
/* Debugging stuff */ /* Debugging stuff */
void _serverAssertWithInfo(const client *c, const robj *o, const char *estr, const char *file, int line); void _serverAssertWithInfo(const client *c, const robj *o, const char *estr, const char *file, int line);