devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0368c4e1945f5bffe83e02ae0b4f19fb066ea502
commit 0368c4e1945f5bffe83e02ae0b4f19fb066ea502 Author: Chris Michael <[email protected]> Date: Tue Mar 18 07:24:32 2014 +0000 ecore-drm: Fix ecore_drm_device_window_set to use an unsigned int @fix: The majority of ecore_evas code expects that the 'window' returned from ecore_evas_window_get be an Ecore_Window. Previously, this was not possible as this function was using a void pointer. This change fixes that issue. Signed-off-by: Chris Michael <[email protected]> --- src/lib/ecore_drm/Ecore_Drm.h | 2 +- src/lib/ecore_drm/ecore_drm_device.c | 2 +- src/lib/ecore_drm/ecore_drm_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_drm/Ecore_Drm.h b/src/lib/ecore_drm/Ecore_Drm.h index 7db37e5..8e1d4d0 100644 --- a/src/lib/ecore_drm/Ecore_Drm.h +++ b/src/lib/ecore_drm/Ecore_Drm.h @@ -142,7 +142,7 @@ EAPI Eina_Bool ecore_drm_device_master_get(Ecore_Drm_Device *dev); EAPI Eina_Bool ecore_drm_device_master_set(Ecore_Drm_Device *dev); EAPI Eina_Bool ecore_drm_device_master_drop(Ecore_Drm_Device *dev); EAPI int ecore_drm_device_fd_get(Ecore_Drm_Device *dev); -EAPI void ecore_drm_device_window_set(Ecore_Drm_Device *dev, void *window); +EAPI void ecore_drm_device_window_set(Ecore_Drm_Device *dev, unsigned int window); EAPI const char *ecore_drm_device_name_get(Ecore_Drm_Device *dev); EAPI Eina_Bool ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name); diff --git a/src/lib/ecore_drm/ecore_drm_device.c b/src/lib/ecore_drm/ecore_drm_device.c index 3d70fb4..e6a790e 100644 --- a/src/lib/ecore_drm/ecore_drm_device.c +++ b/src/lib/ecore_drm/ecore_drm_device.c @@ -597,7 +597,7 @@ ecore_drm_device_fd_get(Ecore_Drm_Device *dev) * @since 1.10 */ EAPI void -ecore_drm_device_window_set(Ecore_Drm_Device *dev, void *window) +ecore_drm_device_window_set(Ecore_Drm_Device *dev, unsigned int window) { /* check for valid device */ if ((!dev) || (dev->drm.fd < 0)) return; diff --git a/src/lib/ecore_drm/ecore_drm_private.h b/src/lib/ecore_drm/ecore_drm_private.h index 6579807..a5094de 100644 --- a/src/lib/ecore_drm/ecore_drm_private.h +++ b/src/lib/ecore_drm/ecore_drm_private.h @@ -280,7 +280,7 @@ struct _Ecore_Drm_Device struct xkb_context *xkb_ctx; - void *window; + unsigned int window; /* #ifdef HAVE_GBM */ /* struct gbm_device *gbm; */ --
