From bac399449d0bc8127a2bfb97e78c1ab6356b201c Mon Sep 17 00:00:00 2001 From: Andrew Kryczka Date: Tue, 29 Jun 2021 08:38:57 -0700 Subject: [PATCH] jemalloc_helper: Limit the mm_malloc.h hack to glibc on linux (#8425) Summary: Original author: kraj (https://github.com/facebook/rocksdb/issues/8413) We have a hack to ensure clang's `posix_memalign()` hack works to be compatible with glibc's `posix_memalign()` declaration. Our side of the hack is irrelevant and should be omitted when not using glibc. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8425 Reviewed By: mrambacher Differential Revision: D29239029 Pulled By: ajkr fbshipit-source-id: 12b900f50a4823b880a6558f25d8590dbfc0aa26 --- port/jemalloc_helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port/jemalloc_helper.h b/port/jemalloc_helper.h index c0ef19a40..ed883b5db 100644 --- a/port/jemalloc_helper.h +++ b/port/jemalloc_helper.h @@ -5,7 +5,7 @@ #pragma once -#if defined(__clang__) +#if defined(__clang__) && defined(__GLIBC__) // glibc's `posix_memalign()` declaration specifies `throw()` while clang's // declaration does not. There is a hack in clang to make its re-declaration // compatible with glibc's if they are declared consecutively. That hack breaks