commit cd973c4f77be116206f6f6518e181858f989c09f
author Diego Novillo <dnovillo@google.com> Mon Jul 27 18:27:23 2015 +0000
committer Diego Novillo <dnovillo@google.com> Mon Jul 27 18:27:23 2015 +0000
tree e27fbbbccc4843ed7431aaba889855a02bc119ac
parent ba70e9e1e63d88f09403e2643421d1baaed4de41

Fix ODR violation. NFC.

There is an ODR conflict between lib/ExecutionEngine/ExecutionEngineBindings.cpp
and lib/Target/TargetMachineC.cpp. The inline definitions should simply
be marked static (thanks dblaikie for the hint).

llvm-svn: 243298

llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp

diff --git a/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp b/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp
index 892c941..f7aba4c 100644
--- a/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp
+++ b/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp
@@ -29,7 +29,7 @@
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(GenericValue, LLVMGenericValueRef)
 
 
-inline LLVMTargetMachineRef wrap(const TargetMachine *P) {
+static LLVMTargetMachineRef wrap(const TargetMachine *P) {
   return
   reinterpret_cast<LLVMTargetMachineRef>(const_cast<TargetMachine*>(P));
 }