Switch to standard integer types in courgette/.

courgette/disassembler_elf_32.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COURGETTE_DISASSEMBLER_ELF_32_H_
 #define COURGETTE_DISASSEMBLER_ELF_32_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "courgette/assembly_program.h"
 #include "courgette/disassembler.h"
 #include "courgette/memory_allocator.h"
 #include "courgette/types_elf.h"
 
 namespace courgette {
 
 class AssemblyProgram;
 
@@ skipping 30 matching lines @@
 
     size_t get_offset() {
       return offset_;
     }
 
     void set_offset(size_t offset) {
       offset_ = offset;
     }
 
     // Computes the relative jump's offset from the op in p.
-    virtual CheckBool ComputeRelativeTarget(const uint8* op_pointer) = 0;
+    virtual CheckBool ComputeRelativeTarget(const uint8_t* op_pointer) = 0;
 
     // Emits the courgette instruction corresponding to the RVA type.
     virtual CheckBool EmitInstruction(AssemblyProgram* program,
                                       RVA target_rva) = 0;
 
-    virtual uint16 op_size() const = 0;
+    virtual uint16_t op_size() const = 0;
 
     static bool IsLessThan(TypedRVA *a, TypedRVA *b) {
       return a->rva() < b->rva();
     }
 
   private:
     const RVA rva_;
     RVA relative_target_;
     size_t offset_;
   };
@@ skipping 26 matching lines @@
 
   Elf32_Half SectionHeaderCount() const {
     return section_header_table_size_;
   }
 
   const Elf32_Shdr *SectionHeader(int id) const {
     assert(id >= 0 && id < SectionHeaderCount());
     return section_header_table_ + id;
   }
 
-  const uint8 *SectionBody(int id) const {
+  const uint8_t* SectionBody(int id) const {
     return OffsetToPointer(SectionHeader(id)->sh_offset);
   }
 
   Elf32_Word SectionBodySize(int id) const {
     return SectionHeader(id)->sh_size;
   }
 
   // Misc Segment Helpers
 
   Elf32_Half ProgramSegmentHeaderCount() const {
@@ skipping 78 matching lines @@
 
   std::vector<RVA> abs32_locations_;
   ScopedVector<TypedRVA> rel32_locations_;
 
   DISALLOW_COPY_AND_ASSIGN(DisassemblerElf32);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_ELF_32_H_