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/classlibnative | |
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/classlibnative')
-rw-r--r-- | src/coreclr/classlibnative/bcltype/varargsnative.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coreclr/classlibnative/bcltype/varargsnative.cpp b/src/coreclr/classlibnative/bcltype/varargsnative.cpp index a5f206aeef5..8862bbc5072 100644 --- a/src/coreclr/classlibnative/bcltype/varargsnative.cpp +++ b/src/coreclr/classlibnative/bcltype/varargsnative.cpp @@ -70,10 +70,10 @@ static void InitCommon(VARARGS *data, VASigCookie** cookie) data->SigPtr = data->ArgCookie->signature.CreateSigPointer(); // Skip the calling convention, get the # of args and skip the return type. - ULONG callConv; + uint32_t callConv; IfFailThrow(data->SigPtr.GetCallingConvInfo(&callConv)); - ULONG sigData; + uint32_t sigData; IfFailThrow(data->SigPtr.GetData(&sigData)); data->RemainingArgs = sigData; |