[RFC XI 2.1 - xserver 8/9] Input: Add initial multitouch support from Xi 2.1

Chase Douglas chase.douglas at canonical.com
Mon Nov 15 10:40:09 PST 2010


On 11/12/2010 09:23 PM, Cyril Brulebois wrote:
> Chase Douglas <chase.douglas at canonical.com> (12/11/2010):
>> --- a/include/inputstr.h
>> +++ b/include/inputstr.h
>> @@ -49,6 +49,8 @@ SOFTWARE.
>>  #ifndef INPUTSTRUCT_H
>>  #define INPUTSTRUCT_H
>>  
>> +#include <X11/extensions/XI2proto.h>
>> +
> 
> This one makes everything explode, but I think xinput proto is to
> blame: it uses types declared in <stdint.h> without including that
> header.
> 
> So it goes fine as long as the #includer of XI2proto.h #includes
> <stdint.h> before #including XI2proto.h, otherwise things do wild:
> |   CC     enterleave.lo
> | In file included from ../include/inputstr.h:53,
> |                  from enterleave.c:34:
> | /usr/include/X11/extensions/XI2proto.h:106: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘FP1616’
> | /usr/include/X11/extensions/XI2proto.h:110: error: expected specifier-qualifier-list before ‘int32_t’
> | In file included from ../include/inputstr.h:53,
> |                  from enterleave.c:34:
> | /usr/include/X11/extensions/XI2proto.h:124: error: expected specifier-qualifier-list before ‘uint16_t’
> | /usr/include/X11/extensions/XI2proto.h:141: error: expected specifier-qualifier-list before ‘uint16_t’
> | […]

My mistake! I should have done "git format-patch HEAD~2" instead of "git
format-patch HEAD^". See the second commit at:

http://cgit.freedesktop.org/~cndougla/inputproto/log/?h=xi2.1-new

Thanks,

-- Chase


More information about the xorg-devel mailing list