Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/llvm/llvm-project.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2017-01-04 08:45:24 +0300
committerSaleem Abdulrasool <compnerd@compnerd.org>2017-01-04 08:45:24 +0300
commit51f0c20dc290dc72bdad67099f597eaa12e058bd (patch)
treec3db7417d08da9998f64efad26800421a30f79e3 /libcxxabi/src/cxa_handlers.cpp
parentbe16876e89dfa4bf86dd84e2fc6108f45bb9d63a (diff)
tweak definition to avoid GCC warning
Use an `extern "C" { }` block around the definition rather than doing the inline definition. This avoids a GCC warning about a declaration being extern and having a definition. NFC. llvm-svn: 290937
Diffstat (limited to 'libcxxabi/src/cxa_handlers.cpp')
-rw-r--r--libcxxabi/src/cxa_handlers.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libcxxabi/src/cxa_handlers.cpp b/libcxxabi/src/cxa_handlers.cpp
index 3f781313df87..ce2cfba35fd6 100644
--- a/libcxxabi/src/cxa_handlers.cpp
+++ b/libcxxabi/src/cxa_handlers.cpp
@@ -104,7 +104,9 @@ terminate() _NOEXCEPT
// In the future this will become:
// std::atomic<std::new_handler> __cxa_new_handler(0);
-extern "C" _LIBCXXABI_DATA_VIS new_handler __cxa_new_handler = 0;
+extern "C" {
+_LIBCXXABI_DATA_VIS new_handler __cxa_new_handler = 0;
+}
new_handler
set_new_handler(new_handler handler) _NOEXCEPT