diff options
| author | Ed Maste <emaste@freebsd.org> | 2013-10-17 20:42:56 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@freebsd.org> | 2013-10-17 20:42:56 +0000 |
| commit | a0191d11014c8da974e8d94fc95bffe78abb24fb (patch) | |
| tree | b98cd0c7091dc6cf294d303f4ed44477b2e4e4b0 | |
| parent | cd2672c9b4562d78953057a24bade10dae330287 (diff) | |
| download | bcm5719-llvm-a0191d11014c8da974e8d94fc95bffe78abb24fb.tar.gz bcm5719-llvm-a0191d11014c8da974e8d94fc95bffe78abb24fb.zip | |
Fix building with ENABLE_DEBUG_PRINTF
Clang tells me that "token pasting of ',' and __VA_ARGS__ is a GNU
extension". Also catch up with changes in function args.
llvm-svn: 192920
| -rw-r--r-- | lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 85cec8c2bd4..2579fe07591 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -70,7 +70,7 @@ #ifdef ENABLE_DEBUG_PRINTF #include <stdio.h> -#define DEBUG_PRINTF(fmt, ...) printf(fmt, ## __VA_ARGS__) +#define DEBUG_PRINTF(fmt, ...) printf(fmt, __VA_ARGS__) #else #define DEBUG_PRINTF(fmt, ...) #endif @@ -4852,9 +4852,8 @@ SymbolFileDWARF::FindCompleteObjCDefinitionTypeForDIE (const DWARFDebugInfoEntry Type *resolved_type = ResolveType (type_cu, type_die, false); if (resolved_type && resolved_type != DIE_IS_BEING_PARSED) { - DEBUG_PRINTF ("resolved 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ") from %s to 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ")\n", + DEBUG_PRINTF ("resolved 0x%8.8" PRIx64 " from %s to 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ")\n", MakeUserID(die->GetOffset()), - MakeUserID(dwarf_cu->GetOffset()), m_obj_file->GetFileSpec().GetFilename().AsCString(), MakeUserID(type_die->GetOffset()), MakeUserID(type_cu->GetOffset())); @@ -5130,7 +5129,7 @@ SymbolFileDWARF::FindDefinitionTypeForDIE (DWARFCompileUnit* cu, { DEBUG_PRINTF ("resolved 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ") from %s to 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ")\n", MakeUserID(die->GetOffset()), - MakeUserID(dwarf_cu->GetOffset()), + MakeUserID(cu->GetOffset()), m_obj_file->GetFileSpec().GetFilename().AsCString(), MakeUserID(type_die->GetOffset()), MakeUserID(type_cu->GetOffset())); @@ -5745,7 +5744,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu, } } - DEBUG_PRINTF ("0x%8.8" PRIx64 ": %s (\"%s\") type => 0x%8.8x\n", MakeUserID(die->GetOffset()), DW_TAG_value_to_name(tag), type_name_cstr, encoding_uid); + DEBUG_PRINTF ("0x%8.8" PRIx64 ": %s (\"%s\") type => 0x%8.8lx\n", MakeUserID(die->GetOffset()), DW_TAG_value_to_name(tag), type_name_cstr, encoding_uid); switch (tag) { |
