Re: includes: Fix IsEqualPropertyKey definitions

2010-02-22 Thread Alexandre Julliard
Maarten Lankhorst writes: >> That doesn't match the PSDK I have, and yes it has a C definition that >> is different from the C++ one, but is also different from yours. > Mine doesn't seem to have a C definition at all, but from the > devpropdef one I assume the C version takes a PROPERTYKEY as pa

Re: includes: Fix IsEqualPropertyKey definitions

2010-02-22 Thread Maarten Lankhorst
Hi AJ, 2010/2/22 Alexandre Julliard : > Maarten Lankhorst writes: > >>> This doesn't match the PSDK. Where does this come from? >> In C, REFPROPERTYKEY becomes PROPERTYKEY*, in C++ it's PROPERTYKEY &, >> so IsEqualPropertyKey will need a different macro. The psdk doesn't >> define this properly f

Re: includes: Fix IsEqualPropertyKey definitions

2010-02-22 Thread Alexandre Julliard
Maarten Lankhorst writes: >> This doesn't match the PSDK. Where does this come from? > In C, REFPROPERTYKEY becomes PROPERTYKEY*, in C++ it's PROPERTYKEY &, > so IsEqualPropertyKey will need a different macro. The psdk doesn't > define this properly for the C case, but since I need it in C code I

Re: includes: Fix IsEqualPropertyKey definitions

2010-02-22 Thread Maarten Lankhorst
Hi AJ, 2010/2/22 Alexandre Julliard : > Maarten Lankhorst writes: > >> @@ -48,7 +48,11 @@ >>  #endif >> >>  #ifndef IsEqualPropertyKey >> +#ifdef __cplusplus >>  #define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && >> IsEqualIID((a).fmtid,(b).fmtid)) >> +#else >> +#define IsEqualPropertyKey(

Re: includes: Fix IsEqualPropertyKey definitions

2010-02-22 Thread Alexandre Julliard
Maarten Lankhorst writes: > @@ -48,7 +48,11 @@ > #endif > > #ifndef IsEqualPropertyKey > +#ifdef __cplusplus > #define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && > IsEqualIID((a).fmtid,(b).fmtid)) > +#else > +#define IsEqualPropertyKey(a,b) (((a)->pid == (b)->pid) && > IsEqualIID(&(a