Merging r258416 and r258428:

[oota-llvm.git] / include / llvm-c / Object.h

diff --git a/include/llvm-c/Object.h b/include/llvm-c/Object.h
index 447fcea7bc240113f73506c4521a7078a3d143e1..a2980e89fe3dff8202aab4a5383c3e19327938e9 100644 (file)
--- a/include/llvm-c/Object.h
+++ b/include/llvm-c/Object.h
@@ -19,7 +19,7 @@
 #ifndef LLVM_C_OBJECT_H
 #define LLVM_C_OBJECT_H
 
-#include "llvm-c/Core.h"
+#include "llvm-c/Types.h"
 #include "llvm/Config/llvm-config.h"
 
 #ifdef __cplusplus
@@ -81,7 +81,6 @@ uint64_t LLVMGetSymbolAddress(LLVMSymbolIteratorRef SI);
 uint64_t LLVMGetSymbolSize(LLVMSymbolIteratorRef SI);
 
 // RelocationRef accessors
-uint64_t LLVMGetRelocationAddress(LLVMRelocationIteratorRef RI);
 uint64_t LLVMGetRelocationOffset(LLVMRelocationIteratorRef RI);
 LLVMSymbolIteratorRef LLVMGetRelocationSymbol(LLVMRelocationIteratorRef RI);
 uint64_t LLVMGetRelocationType(LLVMRelocationIteratorRef RI);