xserver: Branch 'master'

[Keith Packard]

 mi/mieq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e27a839bf0488d5b1cc2e2a887f2ea0e3d790790
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Thu Jun 5 20:38:44 2014 -0700

    mi: Build fix: mieqProcessDeviceEvent returns void
    
    mieq.c:520:9: error: void function 'mieqProcessDeviceEvent' should not return a value [-Wreturn-type,Semantic Issue]
            return 0;
            ^      ~
    1 error generated.
    
    Regression-from: 9fb08310b51b46736f3ca8dbc04efdf502420403
    Found-by: Tinderbox
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/mi/mieq.c b/mi/mieq.c
index 0e27405..872ff93 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -517,7 +517,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen)
 
     /* refuse events from disabled devices */
     if (!dev->enabled)
-        return 0;
+        return;
 
     /* Custom event handler */
     handler = miEventQueue.handlers[event->any.type];