Revert r178713
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178769 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm-c/Core.h b/include/llvm-c/Core.h
index cc78b2e..e85fb97 100644
--- a/include/llvm-c/Core.h
+++ b/include/llvm-c/Core.h
@@ -17,15 +17,14 @@
#include "llvm/Support/DataTypes.h"
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
+#ifdef __cplusplus
+
/* Need these includes to support the LLVM 'cast' template for the C++ 'wrap'
and 'unwrap' conversion functions. */
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/Module.h"
#include "llvm/PassRegistry.h"
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
-#ifdef __cplusplus
extern "C" {
#endif
@@ -2670,9 +2669,7 @@
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
class MemoryBuffer;
class PassManagerBase;
@@ -2766,6 +2763,6 @@
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+#endif /* !defined(__cplusplus) */
-#endif /* defined(LLVM_C_CORE_H) */
+#endif /* !defined(LLVM_C_CORE_H) */
diff --git a/include/llvm-c/ExecutionEngine.h b/include/llvm-c/ExecutionEngine.h
index 6ca316c..cb77bb2 100644
--- a/include/llvm-c/ExecutionEngine.h
+++ b/include/llvm-c/ExecutionEngine.h
@@ -138,9 +138,7 @@
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
struct GenericValue;
class ExecutionEngine;
@@ -159,6 +157,7 @@
#undef DEFINE_SIMPLE_CONVERSION_FUNCTIONS
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+
+#endif /* defined(__cplusplus) */
#endif
diff --git a/include/llvm-c/Object.h b/include/llvm-c/Object.h
index b6fe17a..e2dad62 100644
--- a/include/llvm-c/Object.h
+++ b/include/llvm-c/Object.h
@@ -22,11 +22,9 @@
#include "llvm-c/Core.h"
#include "llvm/Config/llvm-config.h"
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
-#include "llvm/Object/ObjectFile.h"
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
-
#ifdef __cplusplus
+#include "llvm/Object/ObjectFile.h"
+
extern "C" {
#endif
@@ -101,9 +99,7 @@
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
namespace object {
inline ObjectFile *unwrap(LLVMObjectFileRef OF) {
@@ -146,8 +142,8 @@
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+#endif /* defined(__cplusplus) */
#endif
diff --git a/include/llvm-c/Target.h b/include/llvm-c/Target.h
index 0327c04..57abfa0 100644
--- a/include/llvm-c/Target.h
+++ b/include/llvm-c/Target.h
@@ -235,9 +235,7 @@
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
class DataLayout;
class TargetLibraryInfo;
@@ -259,6 +257,7 @@
return reinterpret_cast<LLVMTargetLibraryInfoRef>(X);
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+
+#endif /* defined(__cplusplus) */
#endif
diff --git a/include/llvm-c/TargetMachine.h b/include/llvm-c/TargetMachine.h
index e6f477a..691abdf 100644
--- a/include/llvm-c/TargetMachine.h
+++ b/include/llvm-c/TargetMachine.h
@@ -119,9 +119,7 @@
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
class TargetMachine;
class Target;
@@ -140,6 +138,6 @@
return reinterpret_cast<LLVMTargetRef>(const_cast<Target*>(P));
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+#endif
#endif
diff --git a/include/llvm-c/Transforms/PassManagerBuilder.h b/include/llvm-c/Transforms/PassManagerBuilder.h
index b39dd24..82e513d 100644
--- a/include/llvm-c/Transforms/PassManagerBuilder.h
+++ b/include/llvm-c/Transforms/PassManagerBuilder.h
@@ -18,11 +18,8 @@
typedef struct LLVMOpaquePassManagerBuilder *LLVMPassManagerBuilderRef;
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
-#endif
-
#ifdef __cplusplus
+#include "llvm/Transforms/IPO/PassManagerBuilder.h"
extern "C" {
#endif
@@ -89,9 +86,7 @@
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
inline PassManagerBuilder *unwrap(LLVMPassManagerBuilderRef P) {
return reinterpret_cast<PassManagerBuilder*>(P);
@@ -101,6 +96,6 @@
return reinterpret_cast<LLVMPassManagerBuilderRef>(P);
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+#endif
#endif