[PATCH 1/2] include: Add else cases for __cdecl

[Jacek Caban]

On 17.06.2020 17:18, André Hentschel wrote:
> Am 17.06.20 um 15:49 schrieb Jacek Caban:
>> Hi André,
>>
>> On 17.06.2020 15:09, André Hentschel wrote:
>>> Signed-off-by: André Hentschel <nerv at dawncrow.de>
>>> ---
>>>    include/msvcrt/corecrt.h | 2 ++
>>>    include/windef.h         | 2 +-
>>>    2 files changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
>>> index c98b72f7d35..ad46c56591c 100644
>>> --- a/include/msvcrt/corecrt.h
>>> +++ b/include/msvcrt/corecrt.h
>>> @@ -100,6 +100,8 @@
>>>    #   define __cdecl __attribute__((pcs("aapcs-vfp")))
>>>    # elif defined(__aarch64__) && defined (__GNUC__)
>>>    #  define __cdecl __attribute__((ms_abi))
>>> +# else
>>> +#  define __cdecl
>>>    # endif
>>>    #endif /* __cdecl */
>>>    diff --git a/include/windef.h b/include/windef.h
>>> index 7ece7c8628b..521c3ab4512 100644
>>> --- a/include/windef.h
>>> +++ b/include/windef.h
>>> @@ -93,7 +93,7 @@ extern "C" {
>>>    #   define __cdecl __attribute__((pcs("aapcs-vfp")))
>>>    # elif defined(__aarch64__) && defined (__GNUC__)
>>>    #  define __cdecl __attribute__((ms_abi))
>>> -# elif !defined(_MSC_VER)
>>> +# else
>>>    #  define __cdecl
>>>    # endif
>>>    #endif /* __cdecl */
>>
>> I think __cdecl is a keyword on MSVC, so !defined(_MSC_VER) seems right.
> Hi Jacek,
>
> both changes are inside a block of:
> #if !defined(_MSC_VER) && !defined(__cdecl)
>
> Maybe I should have added more context...


Oh, right, looks good then.


Thanks,

Jacek