propkeydef.h: Fixed DEFINE_PROPERTYKEY define

Jacek Caban jacek at codeweavers.com
Tue Jul 5 07:02:03 CDT 2011


On 07/05/11 13:50, Alexandre Julliard wrote:
> Jacek Caban <jacek at codeweavers.com> writes:
>
>> @@ -33,18 +33,16 @@
>>  #ifdef INITGUID
>>  #ifdef __cplusplus
>>  #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
>> -        EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \
>> -        EXTERN_C const PROPERTYKEY name = \
>> +        EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name = \
>>          { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }, pid }
>>  #else
>>  #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
>> -        const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \
>> -        const PROPERTYKEY name = \
>> +        const PROPERTYKEY DECLSPEC_SELECTANY name = \
>>          { { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }, pid }
>>  #endif
>>  #else
>>  #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \
>> -    EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY
>> +    EXTERN_C const PROPERTYKEY name
> Do you really want to remove DECLSPEC_HIDDEN?

My main point was to use DECLSPEC_SELECTANY properly. It just looked
wrong to add our extensions to public headers, but on the second
thought, DECLSPEC_HIDDEN seems right. I've sent an updated patch.

Thanks,
    Jacek




More information about the wine-devel mailing list