[EGIT] [core/enlightenment] master 01/01: bugfix: Fix wl_desktop_shell compiler warning for Mike

[Christopher Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=ab15d6e2b4ba3a2e31bcf2a0af096f253330c447

commit ab15d6e2b4ba3a2e31bcf2a0af096f253330c447
Author: Chris Michael <devilho...@comcast.net>
Date:   Thu Feb 20 17:11:56 2014 +0000

    bugfix: Fix wl_desktop_shell compiler warning for Mike
    
    The keys array stores keys as unsigned int, so with a little bit of
    casting voodoo, we can avoid the nasty compiler warning messages about
    void pointers used in arithmetic.
    
    Signed-off-by: Chris Michael <devilho...@comcast.net>
---
 src/modules/wl_desktop_shell/e_mod_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c 
b/src/modules/wl_desktop_shell/e_mod_main.c
index 18b5a6c..eae8691 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -1350,11 +1350,11 @@ _e_wl_shell_shell_surface_cb_key_up(void *data, Evas *e 
EINA_UNUSED, Evas_Object
           sym = xkb_keysym_from_name(ev->key, XKB_KEYSYM_CASE_INSENSITIVE);
         key = sym - 8;
      }
-   end = (kbd->keys.data + kbd->keys.size);
+   end = ((unsigned int *)kbd->keys.data + kbd->keys.size);
    for (k = kbd->keys.data; k < end; k++)
      if ((*k == key)) *k = *--end;
 
-   kbd->keys.size = (void *)end - kbd->keys.data;
+   kbd->keys.size = end - (unsigned int *)kbd->keys.data;
 
    /* try to get the current keyboard's grab interface. 
     * Fallback to the default grab */
@@ -1420,14 +1420,14 @@ _e_wl_shell_shell_surface_cb_key_down(void *data, Evas 
*e EINA_UNUSED, Evas_Obje
    kbd->grab_key = key;
    kbd->grab_time = ev->timestamp;
 
-   end = (kbd->keys.data + kbd->keys.size);
+   end = ((unsigned int *)kbd->keys.data + kbd->keys.size);
    for (k = kbd->keys.data; k < end; k++)
      {
         /* ignore server generated key repeats */
         if ((*k == key)) return;
      }
 
-   kbd->keys.size = (void *)end - kbd->keys.data;
+   kbd->keys.size = end - (unsigned int *)kbd->keys.data;
    k = wl_array_add(&kbd->keys, sizeof(*k));
    *k = key;
 

--