Re: [Xen-devel] [PATCH 30/34] xen: Add missing includes on different files

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 09.04.14 at 18:06, <julien.grall@xxxxxxxxxx> wrote:
> On 03/27/2014 07:57 AM, Jan Beulich wrote:
>>>>> On 26.03.14 at 18:41, <julien.grall@xxxxxxxxxx> wrote:
>>> In file included from multicall.c:41:0:
>>> ../multicall.c:38:1: error: conflicting types for âcompat_multicallâ
>>> In file included from ../multicall.c:9:0,
>>>                  from multicall.c:41:
>> 
>> Meaning this needs to be dealt with differently: Include the header in
>> both files _and_ add a declaration of compat_multicall() to it (alongside
>> the other compat_ ones already there).
> 
> I gave a look to this solution. It won't works because do_multicall is
> replaced by the define in compat/multicall.c:26. It will end up to
> multiple definition of compat_multcall.
> 
> I'm not sure how to handle it because, AFAIU, compat/multicall.c is
> defining some macro to redefine the behavior of multicall.c

Right, but that doesn't prevent the suggested model afaict:

- compat/multicall.c includes xen/hypercall.h, obtaining proper
  prototypes for both do_multicall() and compat_multicall()
- compat/multicall.c re-defines do_multicall (which doesn't affect
  the prototypes already seen)
- compat/multicall.c includes multicall.c
- multicall.c's inclusion of xen/hypercall.h does nothing (thanks
  to the header guard)

Did you indeed try this and it didn't work?

Jan

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel