From: Ed Maste Date: Mon, 14 Mar 2016 20:39:08 +0000 (+0000) Subject: Shuffle an #undef to avoid a warning on FreeBSD X-Git-Tag: llvmorg-3.9.0-rc1~11742 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d1eb1de744a70cf35cec8fd090d26b7ad108d79;p=platform%2Fupstream%2Fllvm.git Shuffle an #undef to avoid a warning on FreeBSD On FreeBSD _LIBCPP_EXTERN_TEMPLATE is being defined from something included by lldb/lldb-private.h. Undefine it after the #include to avoid the redefinition warning. Differential Revision: http://reviews.llvm.org/D17402 llvm-svn: 263486 --- diff --git a/lldb/source/Core/CxaDemangle.cpp b/lldb/source/Core/CxaDemangle.cpp index 409f404..62335a9 100644 --- a/lldb/source/Core/CxaDemangle.cpp +++ b/lldb/source/Core/CxaDemangle.cpp @@ -20,9 +20,8 @@ #include "lldb/Host/windows/win32.h" // snprintf #endif #include "llvm/Support/Compiler.h" // LLVM_{NOEXCEPT, CONSTEXPR, ALIGNAS} -#undef _LIBCPP_EXTERN_TEMPLATE // Avoid warning below - #include "lldb/lldb-private.h" +#undef _LIBCPP_EXTERN_TEMPLATE // Avoid warning below //===-------------------------- cxa_demangle.cpp --------------------------===// //