Index: courgette/types_win_pe.h |
diff --git a/courgette/types_win_pe.h b/courgette/types_win_pe.h |
index eed88af6b057202bbd8b08069d4cd1a4e3569072..f926b5f65c55e2b0558bc8fac1164fdc32f84059 100644 |
--- a/courgette/types_win_pe.h |
+++ b/courgette/types_win_pe.h |
@@ -5,8 +5,8 @@ |
#ifndef TYPES_WIN_PE_H_ |
#define TYPES_WIN_PE_H_ |
-#include "base/basictypes.h" |
- |
+#include <stddef.h> |
+#include <stdint.h> |
namespace courgette { |
@@ -17,15 +17,15 @@ namespace courgette { |
#pragma pack(push, 1) // Supported by MSVC and GCC. Ensures no gaps in packing. |
struct Section { |
char name[8]; |
- uint32 virtual_size; |
- uint32 virtual_address; |
- uint32 size_of_raw_data; |
- uint32 file_offset_of_raw_data; |
- uint32 pointer_to_relocations; // Always zero in an image. |
- uint32 pointer_to_line_numbers; // Always zero in an image. |
- uint16 number_of_relocations; // Always zero in an image. |
- uint16 number_of_line_numbers; // Always zero in an image. |
- uint32 characteristics; |
+ uint32_t virtual_size; |
+ uint32_t virtual_address; |
+ uint32_t size_of_raw_data; |
+ uint32_t file_offset_of_raw_data; |
+ uint32_t pointer_to_relocations; // Always zero in an image. |
+ uint32_t pointer_to_line_numbers; // Always zero in an image. |
+ uint16_t number_of_relocations; // Always zero in an image. |
+ uint16_t number_of_line_numbers; // Always zero in an image. |
+ uint32_t characteristics; |
}; |
#pragma pack(pop) |
@@ -39,7 +39,7 @@ class ImageDataDirectory { |
public: |
ImageDataDirectory() : address_(0), size_(0) {} |
RVA address_; |
- uint32 size_; |
+ uint32_t size_; |
}; |
static_assert(sizeof(ImageDataDirectory) == 8, |
@@ -54,8 +54,8 @@ static_assert(sizeof(ImageDataDirectory) == 8, |
// This is FIELD_OFFSET(IMAGE_DOS_HEADER, e_lfanew): |
const size_t kOffsetOfFileAddressOfNewExeHeader = 0x3c; |
-const uint16 kImageNtOptionalHdr32Magic = 0x10b; |
-const uint16 kImageNtOptionalHdr64Magic = 0x20b; |
+const uint16_t kImageNtOptionalHdr32Magic = 0x10b; |
+const uint16_t kImageNtOptionalHdr64Magic = 0x20b; |
const size_t kSizeOfCoffHeader = 20; |
const size_t kOffsetOfDataDirectoryFromImageOptionalHeader32 = 96; |