From: Yi Wu <yiwu@pingcap.com>
Date: Sat, 9 Mar 2019 01:02:00 +0000 (-0800)
Subject: Fix build failures due to missing JEMALLOC_CXX_THROW macro (#5053)
X-Git-Tag: v6.0.2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9fc8c627eb38d6426e272e4f34e9bc9ee349975;p=rocksdb.git

Fix build failures due to missing JEMALLOC_CXX_THROW macro (#5053)

Summary:
JEMALLOC_CXX_THROW is not defined for earlier versions of jemalloc (e.g. 3.6), causing builds to fail on some platforms. Fixing it. Closes #4869
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5053

Differential Revision: D14390034

Pulled By: sagar0

fbshipit-source-id: b2b7a03cd377201ef385eb521f65bae85c558055
---

diff --git a/HISTORY.md b/HISTORY.md
index 9a9d7bc8..06d4dd04 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -9,6 +9,10 @@
 * Make BlobDB wait for all background tasks on shutdown.
 * Fixed a BlobDB issue where some trash files are not tracked causing them to remain forever.
 
+### Bug Fixes
+* Fix JEMALLOC_CXX_THROW macro missing from older Jemalloc versions, causing build failures on some platforms.
+
+
 ## 6.0.0 (2/19/2019)
 ### New Features
 * Enabled checkpoint on readonly db (DBImplReadOnly).
diff --git a/port/jemalloc_helper.h b/port/jemalloc_helper.h
index 412a80d2..0c216fac 100644
--- a/port/jemalloc_helper.h
+++ b/port/jemalloc_helper.h
@@ -12,6 +12,10 @@
 #include <jemalloc/jemalloc.h>
 #endif
 
+#ifndef JEMALLOC_CXX_THROW
+#define JEMALLOC_CXX_THROW
+#endif
+
 // Declare non-standard jemalloc APIs as weak symbols. We can null-check these
 // symbols to detect whether jemalloc is linked with the binary.
 extern "C" void* mallocx(size_t, int) __attribute__((__weak__));