diff options
Diffstat (limited to 'src/common/dwarf')
-rw-r--r-- | src/common/dwarf/bytereader-inl.h | 4 | ||||
-rw-r--r-- | src/common/dwarf/cfi_assembler.cc | 6 | ||||
-rw-r--r-- | src/common/dwarf/dwarf2diehandler.cc | 4 | ||||
-rw-r--r-- | src/common/dwarf/dwarf2reader.cc | 10 | ||||
-rw-r--r-- | src/common/dwarf/dwarf2reader_cfi_unittest.cc | 9 |
5 files changed, 18 insertions, 15 deletions
diff --git a/src/common/dwarf/bytereader-inl.h b/src/common/dwarf/bytereader-inl.h index 57fce448..3c167089 100644 --- a/src/common/dwarf/bytereader-inl.h +++ b/src/common/dwarf/bytereader-inl.h @@ -29,10 +29,10 @@ #ifndef UTIL_DEBUGINFO_BYTEREADER_INL_H__ #define UTIL_DEBUGINFO_BYTEREADER_INL_H__ -#include <cassert> - #include "common/dwarf/bytereader.h" +#include <assert.h> + namespace dwarf2reader { inline uint8 ByteReader::ReadOneByte(const char* buffer) const { diff --git a/src/common/dwarf/cfi_assembler.cc b/src/common/dwarf/cfi_assembler.cc index 50e92e5a..a6a5aca6 100644 --- a/src/common/dwarf/cfi_assembler.cc +++ b/src/common/dwarf/cfi_assembler.cc @@ -32,11 +32,11 @@ // cfi_assembler.cc: Implementation of google_breakpad::CFISection class. // See cfi_assembler.h for details. -#include <cassert> -#include <stdlib.h> - #include "common/dwarf/cfi_assembler.h" +#include <assert.h> +#include <stdlib.h> + namespace google_breakpad { using dwarf2reader::DwarfPointerEncoding; diff --git a/src/common/dwarf/dwarf2diehandler.cc b/src/common/dwarf/dwarf2diehandler.cc index 099f5193..5d019293 100644 --- a/src/common/dwarf/dwarf2diehandler.cc +++ b/src/common/dwarf/dwarf2diehandler.cc @@ -31,10 +31,10 @@ // dwarf2diehandler.cc: Implement the dwarf2reader::DieDispatcher class. // See dwarf2diehandler.h for details. -#include <cassert> - #include "common/dwarf/dwarf2diehandler.h" +#include <assert.h> + namespace dwarf2reader { DIEDispatcher::~DIEDispatcher() { diff --git a/src/common/dwarf/dwarf2reader.cc b/src/common/dwarf/dwarf2reader.cc index 1a397019..a2915bad 100644 --- a/src/common/dwarf/dwarf2reader.cc +++ b/src/common/dwarf/dwarf2reader.cc @@ -31,16 +31,18 @@ // Implementation of dwarf2reader::LineInfo, dwarf2reader::CompilationUnit, // and dwarf2reader::CallFrameInfo. See dwarf2reader.h for details. -#include <cassert> -#include <cstdio> -#include <cstring> +#include "common/dwarf/dwarf2reader.h" + +#include <assert.h> +#include <stdio.h> +#include <string.h> + #include <map> #include <memory> #include <stack> #include <utility> #include "common/dwarf/bytereader-inl.h" -#include "common/dwarf/dwarf2reader.h" #include "common/dwarf/bytereader.h" #include "common/dwarf/line_state_machine.h" diff --git a/src/common/dwarf/dwarf2reader_cfi_unittest.cc b/src/common/dwarf/dwarf2reader_cfi_unittest.cc index 85889f88..1a2431c7 100644 --- a/src/common/dwarf/dwarf2reader_cfi_unittest.cc +++ b/src/common/dwarf/dwarf2reader_cfi_unittest.cc @@ -31,7 +31,8 @@ // dwarf2reader_cfi_unittest.cc: Unit tests for dwarf2reader::CallFrameInfo -#include <cstdlib> +#include <stdlib.h> + #include <vector> // The '.eh_frame' format, used by the Linux C++ ABI for exception @@ -45,9 +46,9 @@ // interpretation against the test's intentions. Each ELF file is named // "cfitest-TEST", where TEST identifies the particular test. #ifdef WRITE_ELF -#include <cstdio> -#include <cerrno> -#include <cstring> +#include <errno.h> +#include <stdio.h> +#include <string.h> extern "C" { // To compile with WRITE_ELF, you should add the 'include' directory // of the binutils, gcc, or gdb source tree to your #include path; |