From: Giuseppe Ottaviano <ott@fb.com>
Date: Tue, 23 Aug 2016 17:14:40 +0000 (-0700)
Subject: Make Malloc.h self-contained again
X-Git-Tag: v2016.08.29.00~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=89166c82417a52f99dd373f510dd5119574dbf33;p=folly.git

Make Malloc.h self-contained again

Summary: D3743475 adds to `Malloc.h` a dependency on another folly header, which breaks it when used in stand-alone mode. This diff moves the include to the right `#ifdef` section.

Reviewed By: Gownta

Differential Revision: D3757819

fbshipit-source-id: 71664ca6a3a47b6e4449a4ef603fedf052c5df3b
---

diff --git a/folly/Malloc.h b/folly/Malloc.h
index 64fd393d..fec188f5 100644
--- a/folly/Malloc.h
+++ b/folly/Malloc.h
@@ -20,8 +20,6 @@
 #pragma once
 #define FOLLY_MALLOC_H_
 
-#include <folly/portability/BitsFunctexcept.h>
-
 /**
  * Define various MALLOCX_* macros normally provided by jemalloc.  We define
  * them so that we don't have to include jemalloc.h, in case the program is
@@ -42,6 +40,7 @@
 #if defined(_GLIBCXX_USE_FB) && !defined(_LIBSTDCXX_FBSTRING)
 
 #include <folly/detail/Malloc.h>
+#include <folly/portability/BitsFunctexcept.h>
 
 #include <string>
 
@@ -87,13 +86,19 @@ extern "C" int mallctlbymib(const size_t*, size_t, void*, size_t*, void*,
                             size_t)
 __attribute__((__weak__));
 
+#include <bits/functexcept.h>
+
 #define FOLLY_HAVE_MALLOC_H 1
-#else
+
+#else // !defined(_LIBSTDCXX_FBSTRING)
+
 #include <folly/detail/Malloc.h> /* nolint */
+#include <folly/portability/BitsFunctexcept.h> /* nolint */
+
 #endif
 
 // for malloc_usable_size
-// NOTE: FreeBSD 9 doesn't have malloc.h.  It's defitions
+// NOTE: FreeBSD 9 doesn't have malloc.h.  Its definitions
 // are found in stdlib.h.
 #if FOLLY_HAVE_MALLOC_H
 #include <malloc.h>