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

…nstable
Snapchat · Mar 19, 2019 · c406e7f · c406e7f
2 parents 31ff6cf + a9e525c
commit c406e7f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/server.h b/src/server.h
@@ -2330,11 +2330,13 @@ void lolwutCommand(client *c);
 void aclCommand(client *c);
 
 #if defined(__GNUC__)
+#ifndef __cplusplus
 void *calloc(size_t count, size_t size) __attribute__ ((deprecated));
 void free(void *ptr) __attribute__ ((deprecated));
 void *malloc(size_t size) __attribute__ ((deprecated));
 void *realloc(void *ptr, size_t size) __attribute__ ((deprecated));
 #endif
+#endif
 
 /* Debugging stuff */
 void _serverAssertWithInfo(const client *c, const robj *o, const char *estr, const char *file, int line);