On 22.03.23 13:38, Jan Beulich wrote:
> On 22.03.2023 13:08, Juergen Gross wrote:
>> --- a/tools/tests/vpci/emul.h
>> +++ b/tools/tests/vpci/emul.h
>> @@ -106,22 +106,6 @@ typedef union {
>>   #define BUG() assert(0)
>>   #define ASSERT_UNREACHABLE() assert(0)
>>   
>> -#define min(x, y) ({                    \
>> -        const typeof(x) tx = (x);       \
>> -        const typeof(y) ty = (y);       \
>> -                                        \
>> -        (void) (&tx == &ty);            \
>> -        tx < ty ? tx : ty;              \
>> -})
>> -
>> -#define max(x, y) ({                    \
>> -        const typeof(x) tx = (x);       \
>> -        const typeof(y) ty = (y);       \
>> -                                        \
>> -        (void) (&tx == &ty);            \
>> -        tx > ty ? tx : ty;              \
>> -})
> 
> The new include is added to this file by the first patch. How do things
> build warning-free before these macros (functionally compatible but
> different in the specific tokens used) are removed, i.e. before this
> patch is (also) applied?

Oh, I seem to have failed to make a test build of the tools/tests directory
after applying only the first patch.

It would be probably be the best to switch patches 1 and 2 while keeping the
"#include <xen-tools/common-macros.h>" in tools/tests/vpci/emul.h in the first
patch.


Juergen