Commit 4092a75d authored by antirez's avatar antirez
Browse files

Avoid collision with MacOS LIST_HEAD macro after #6384.

parent e5b5f9a2
...@@ -388,6 +388,14 @@ int jemalloc_purge() { ...@@ -388,6 +388,14 @@ int jemalloc_purge() {
#endif #endif
#if defined(__APPLE__)
/* For proc_pidinfo() used later in zmalloc_get_smap_bytes_by_field().
* Note that this file cannot be included in zmalloc.h because it includes
* a Darwin queue.h file where there is a "LIST_HEAD" macro (!) defined
* conficting with Redis user code. */
#include <libproc.h>
#endif
/* Get the sum of the specified field (converted form kb to bytes) in /* Get the sum of the specified field (converted form kb to bytes) in
* /proc/self/smaps. The field must be specified with trailing ":" as it * /proc/self/smaps. The field must be specified with trailing ":" as it
* apperas in the smaps output. * apperas in the smaps output.
......
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <malloc/malloc.h> #include <malloc/malloc.h>
#include <libproc.h>
#define HAVE_MALLOC_SIZE 1 #define HAVE_MALLOC_SIZE 1
#define zmalloc_size(p) malloc_size(p) #define zmalloc_size(p) malloc_size(p)
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment