diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-09-18 15:07:33 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-09-18 15:07:33 -0700 |
| commit | ef9bd62c68c2c279926e66058bc5a6ef62150432 (patch) | |
| tree | 247f92a4e885f15dbcd37685fa9dbaa7c1db7c67 /include/llvm-c | |
| parent | 5868d5c7576d519a0bba685e7a0471ee306f5eee (diff) | |
| parent | 8e70b5506ec0d7a6c2740bc89cd1b8f12a78b24f (diff) | |
Merge commit '8e70b5506ec0d7a6c2740bc89cd1b8f12a78b24f'
Conflicts:
include/llvm/CodeGen/ISDOpcodes.h
include/llvm/Target/Target.td
include/llvm/Target/TargetLowering.h
include/llvm/Target/TargetOpcodes.h
lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
lib/Target/Mips/MipsMCInstLower.cpp
utils/TableGen/CodeGenTarget.cpp
Diffstat (limited to 'include/llvm-c')
| -rw-r--r-- | include/llvm-c/Core.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/llvm-c/Core.h b/include/llvm-c/Core.h index eceae5c7b6..6587e77080 100644 --- a/include/llvm-c/Core.h +++ b/include/llvm-c/Core.h @@ -173,10 +173,11 @@ typedef enum { LLVMUWTable = 1 << 30, LLVMNonLazyBind = 1 << 31 - // FIXME: This attribute is currently not included in the C API as - // a temporary measure until the API/ABI impact to the C API is understood - // and the path forward agreed upon. - //LLVMAddressSafety = 1ULL << 32 + /* FIXME: This attribute is currently not included in the C API as + a temporary measure until the API/ABI impact to the C API is understood + and the path forward agreed upon. + LLVMAddressSafety = 1ULL << 32 + */ } LLVMAttribute; typedef enum { @@ -2687,7 +2688,7 @@ namespace llvm { template<typename T> inline T **unwrap(LLVMValueRef *Vals, unsigned Length) { - #if DEBUG + #ifdef DEBUG for (LLVMValueRef *I = Vals, *E = Vals + Length; I != E; ++I) cast<T>(*I); #endif |