[llvm] r178769 - Revert r178713
Evan Cheng
evan.cheng at apple.com
Thu Apr 4 10:40:54 PDT 2013
Author: evancheng
Date: Thu Apr 4 12:40:53 2013
New Revision: 178769
URL: http://llvm.org/viewvc/llvm-project?rev=178769&view=rev
Log:
Revert r178713
Modified:
llvm/trunk/include/llvm-c/Core.h
llvm/trunk/include/llvm-c/ExecutionEngine.h
llvm/trunk/include/llvm-c/Object.h
llvm/trunk/include/llvm-c/Target.h
llvm/trunk/include/llvm-c/TargetMachine.h
llvm/trunk/include/llvm-c/Transforms/PassManagerBuilder.h
Modified: llvm/trunk/include/llvm-c/Core.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Core.h?rev=178769&r1=178768&r2=178769&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/Core.h (original)
+++ llvm/trunk/include/llvm-c/Core.h Thu Apr 4 12:40:53 2013
@@ -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 @@ LLVMBool LLVMIsMultithreaded();
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
class MemoryBuffer;
class PassManagerBase;
@@ -2766,6 +2763,6 @@ namespace llvm {
}
}
-#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) */
Modified: llvm/trunk/include/llvm-c/ExecutionEngine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/ExecutionEngine.h?rev=178769&r1=178768&r2=178769&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/ExecutionEngine.h (original)
+++ llvm/trunk/include/llvm-c/ExecutionEngine.h Thu Apr 4 12:40:53 2013
@@ -138,9 +138,7 @@ void *LLVMGetPointerToGlobal(LLVMExecuti
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
struct GenericValue;
class ExecutionEngine;
@@ -159,6 +157,7 @@ namespace llvm {
#undef DEFINE_SIMPLE_CONVERSION_FUNCTIONS
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+
+#endif /* defined(__cplusplus) */
#endif
Modified: llvm/trunk/include/llvm-c/Object.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Object.h?rev=178769&r1=178768&r2=178769&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/Object.h (original)
+++ llvm/trunk/include/llvm-c/Object.h Thu Apr 4 12:40:53 2013
@@ -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)
+#ifdef __cplusplus
#include "llvm/Object/ObjectFile.h"
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
-#ifdef __cplusplus
extern "C" {
#endif
@@ -101,9 +99,7 @@ const char *LLVMGetRelocationValueString
#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 @@ namespace llvm {
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+#endif /* defined(__cplusplus) */
#endif
Modified: llvm/trunk/include/llvm-c/Target.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Target.h?rev=178769&r1=178768&r2=178769&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/Target.h (original)
+++ llvm/trunk/include/llvm-c/Target.h Thu Apr 4 12:40:53 2013
@@ -235,9 +235,7 @@ void LLVMDisposeTargetData(LLVMTargetDat
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
class DataLayout;
class TargetLibraryInfo;
@@ -259,6 +257,7 @@ namespace llvm {
return reinterpret_cast<LLVMTargetLibraryInfoRef>(X);
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+
+#endif /* defined(__cplusplus) */
#endif
Modified: llvm/trunk/include/llvm-c/TargetMachine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/TargetMachine.h?rev=178769&r1=178768&r2=178769&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/TargetMachine.h (original)
+++ llvm/trunk/include/llvm-c/TargetMachine.h Thu Apr 4 12:40:53 2013
@@ -119,9 +119,7 @@ LLVMBool LLVMTargetMachineEmitToFile(LLV
#ifdef __cplusplus
}
-#endif
-#if defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS)
namespace llvm {
class TargetMachine;
class Target;
@@ -140,6 +138,6 @@ namespace llvm {
return reinterpret_cast<LLVMTargetRef>(const_cast<Target*>(P));
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+#endif
#endif
Modified: llvm/trunk/include/llvm-c/Transforms/PassManagerBuilder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Transforms/PassManagerBuilder.h?rev=178769&r1=178768&r2=178769&view=diff
==============================================================================
--- llvm/trunk/include/llvm-c/Transforms/PassManagerBuilder.h (original)
+++ llvm/trunk/include/llvm-c/Transforms/PassManagerBuilder.h Thu Apr 4 12:40:53 2013
@@ -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 @@ void LLVMPassManagerBuilderPopulateLTOPa
#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 @@ namespace llvm {
return reinterpret_cast<LLVMPassManagerBuilderRef>(P);
}
}
-#endif /* defined(__cplusplus) && !defined(LLVM_DO_NOT_INCLUDE_CPP_HEADERS) */
+#endif
#endif
More information about the llvm-commits
mailing list