diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-11-25 09:36:32 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-11-25 10:04:49 +0000 |
| commit | 34057611c67b751c43d6bd70a7d5993708262cd2 (patch) | |
| tree | 202b409de511c6363df7bcd32a9b5143a9c4a300 | |
| parent | d2df10e28fa35d29b539dc52c61f710910b75831 (diff) | |
Correct type of uevent_handler
xf86AddGeneralHandler returns an opaque pointer, not a function pointer.
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna.h | 2 | ||||
| -rw-r--r-- | src/sna/sna_driver.c | 6 | ||||
| -rw-r--r-- | src/uxa/intel.h | 2 | ||||
| -rw-r--r-- | src/uxa/intel_driver.c | 6 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/sna/sna.h b/src/sna/sna.h index b3e38a3c..8a7a94fb 100644 --- a/src/sna/sna.h +++ b/src/sna/sna.h @@ -329,7 +329,7 @@ struct sna { #if HAVE_UDEV struct udev_monitor *uevent_monitor; - InputHandlerProc uevent_handler; + pointer uevent_handler; #endif struct { diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index d89fb1f8..4a96faff 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -766,10 +766,8 @@ sna_uevent_init(ScrnInfoPtr scrn) return; } - sna->uevent_handler = - xf86AddGeneralHandler(udev_monitor_get_fd(mon), - sna_handle_uevents, - scrn); + sna->uevent_handler = xf86AddGeneralHandler(udev_monitor_get_fd(mon), + sna_handle_uevents, scrn); if (!sna->uevent_handler) { udev_monitor_unref(mon); udev_unref(u); diff --git a/src/uxa/intel.h b/src/uxa/intel.h index ded975ff..6ac770e3 100644 --- a/src/uxa/intel.h +++ b/src/uxa/intel.h @@ -351,7 +351,7 @@ typedef struct intel_screen_private { unsigned debug_flush; #if HAVE_UDEV struct udev_monitor *uevent_monitor; - InputHandlerProc uevent_handler; + pointer uevent_handler; #endif Bool has_prime_vmap_flush; } intel_screen_private; diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index e035973b..46e06dfb 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -875,10 +875,8 @@ I830UeventInit(ScrnInfoPtr scrn) return; } - intel->uevent_handler = - xf86AddGeneralHandler(udev_monitor_get_fd(mon), - I830HandleUEvents, - scrn); + intel->uevent_handler = xf86AddGeneralHandler(udev_monitor_get_fd(mon), + I830HandleUEvents, scrn); if (!intel->uevent_handler) { udev_monitor_unref(mon); udev_unref(u); |