xserver: Branch 'master' - 14 commits

[Michal Suchanek]

Hello,

On 15 May 2012 06:20, Peter Hutterer <peter.hutterer at who-t.net> wrote:
> On Mon, May 14, 2012 at 10:39:24AM -0700, Keith Packard wrote:

>> diff --git a/dix/enterleave.h b/dix/enterleave.h
>> index 729059b..c937c0e 100644
>> --- a/dix/enterleave.h
>> +++ b/dix/enterleave.h
>> @@ -60,9 +60,6 @@ extern void LeaveWindow(DeviceIntPtr dev);
>>  extern void CoreFocusEvent(DeviceIntPtr kbd,
>>                             int type, int mode, int detail, WindowPtr pWin);
>>
>> -extern void DeviceFocusEvent(DeviceIntPtr kbd,
>> -                             int type, int mode, int detail, WindowPtr pWin);
>> -
>>  extern void SetFocusIn(DeviceIntPtr kbd, WindowPtr win);
>>
>>  extern void SetFocusOut(DeviceIntPtr dev);
>
> This hunk gives me
>
> enterleave.c: In function 'DeviceFocusOutEvents':
> enterleave.c:618:9: error: implicit declaration of function
> 'DeviceFocusEvent' [-Werror=implicit-function-declaration]
> enterleave.c:618:9: warning: nested extern declaration of 'DeviceFocusEvent'
> [-Wnested-externs]
>

I did some compile tests but maybe this one slipped by.

Just add this additional hunk.

Thanks

Michal
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-undeclared-function-in-enterleave.c.patch
Type: application/octet-stream
Size: 608 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120515/d27a3924/attachment.obj>