diff options
| author | hjk <qtc-committer@nokia.com> | 2012-04-24 09:03:19 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-04-24 17:07:36 +0200 |
| commit | c0d79532306746889b07c585c4eb2ebf178cafb3 (patch) | |
| tree | 457879aa7d4e68efe12608ccd26bec55676e8aa8 /src/plugins | |
| parent | 071b24d97ebde950eec2774af568a50945e31c15 (diff) | |
| download | qt-creator-c0d79532306746889b07c585c4eb2ebf178cafb3.tar.gz | |
debugger: simplify #if/#else structure to make lupdate happy
Change-Id: I0f9668681645a0bedaccd45abb806e59905d561c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/debugger/shared/peutils.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp index 04bf69c4c0..8fa51b5537 100644 --- a/src/plugins/debugger/shared/peutils.cpp +++ b/src/plugins/debugger/shared/peutils.cpp @@ -141,8 +141,11 @@ static bool getDebugDirectory(IMAGE_NT_HEADERS *ntHeaders, void *fileMemory, DWORD debugDirSize; *debugDir = 0; *count = 0; + #ifdef __GNUC__ // MinGW does not have complete 64bit definitions. - typedef IMAGE_OPTIONAL_HEADER IMAGE_OPTIONAL_HEADER32; + IMAGE_OPTIONAL_HEADER *optionalHeader = reinterpret_cast<IMAGE_OPTIONAL_HEADER*>(&(ntHeaders->OptionalHeader)); + debugDirRva = optionalHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress; + debugDirSize = optionalHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size; #else // Find the virtual address const bool is64Bit = ntHeaders->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC; @@ -151,13 +154,12 @@ static bool getDebugDirectory(IMAGE_NT_HEADERS *ntHeaders, void *fileMemory, debugDirRva = optionalHeader64->DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress; debugDirSize = optionalHeader64->DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size; } else { -#endif IMAGE_OPTIONAL_HEADER32 *optionalHeader32 = reinterpret_cast<IMAGE_OPTIONAL_HEADER32*>(&(ntHeaders->OptionalHeader)); debugDirRva = optionalHeader32->DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress; debugDirSize = optionalHeader32->DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size; -#ifndef __GNUC__ } #endif + // Empty. This is the case for MinGW binaries if (debugDirSize == 0) return true; |