about summary refs log tree commit diff
path: root/src/rustllvm/rustllvm.h
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-01-06 20:41:33 +0000
committerbors <bors@rust-lang.org>2018-01-06 20:41:33 +0000
commit6828cf90146c7fefc4ba4f16dffe75f763f2d910 (patch)
tree44e745909b8c8bfc2808bacc08f5aeee4916e65e /src/rustllvm/rustllvm.h
parent72176cf96cb79a0ebf62972b76dbe68c933bef4d (diff)
parentce701061384bae7c3b9873460c1c5df8204431fc (diff)
downloadrust-6828cf90146c7fefc4ba4f16dffe75f763f2d910.tar.gz
rust-6828cf90146c7fefc4ba4f16dffe75f763f2d910.zip
Auto merge of #47235 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests

- Successful merges: #46947, #47170, #47190, #47205, #47217, #47220, #47230
- Failed merges: #47233
Diffstat (limited to 'src/rustllvm/rustllvm.h')
-rw-r--r--src/rustllvm/rustllvm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rustllvm/rustllvm.h b/src/rustllvm/rustllvm.h
index 8c2f855c226..714173f8602 100644
--- a/src/rustllvm/rustllvm.h
+++ b/src/rustllvm/rustllvm.h
@@ -71,7 +71,7 @@
 #include "llvm/IR/IRPrintingPasses.h"
 #include "llvm/Linker/Linker.h"
 
-void LLVMRustSetLastError(const char *);
+extern "C" void LLVMRustSetLastError(const char *);
 
 enum class LLVMRustResult { Success, Failure };