diff options
| author | David Wrighton <davidwr@microsoft.com> | 2021-02-18 06:03:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 06:03:19 +0300 |
| commit | 4f3545e2d1466512f53a2cd8b0db71667810c083 (patch) | |
| tree | 3439d1575be09a88ccff595b83c930c9e15df0f6 /src/coreclr/pal | |
| parent | aa138f7cb11502043a12668f48a6bc122be27485 (diff) | |
Adjust logic in cor.h, corhdr.h, corinfo.h, corjit.h and such so that they may be included without the PAL (#46055)
This was done via simple substitution of the standard sized integer types, and dealing with the fallout. It is tested by using the ICorJitInfo interface directly within the crossgen2 jitinterface thunk library.
Effort was made to use a minimum number of casts, as casts in such a large change are likely to be wrong somewhere.
- Exceptions are the use of casting to handle some calls to the existing internal metadata api and around use of char16_t.
In addition, a small amount of logic from the PAL headers were pulled into the proper header to allow compilation in the presence of some SAL annotation, and other small details.
Diffstat (limited to 'src/coreclr/pal')
| -rw-r--r-- | src/coreclr/pal/inc/rt/ntimage.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/coreclr/pal/inc/rt/ntimage.h b/src/coreclr/pal/inc/rt/ntimage.h index 931d528404d..1880375184f 100644 --- a/src/coreclr/pal/inc/rt/ntimage.h +++ b/src/coreclr/pal/inc/rt/ntimage.h @@ -243,12 +243,16 @@ typedef struct _IMAGE_FILE_HEADER { // // Directory format. // +#ifndef IMAGE_DATA_DIRECTORY_DEFINED +#define IMAGE_DATA_DIRECTORY_DEFINED typedef struct _IMAGE_DATA_DIRECTORY { ULONG VirtualAddress; ULONG Size; } IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY; +#endif // IMAGE_DATA_DIRECTORY_DEFINED + #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 // |