fix build break 74/38474/1 accepted/tizen/common/20150424.100300 accepted/tizen/mobile/20150424.063945 accepted/tizen/tv/20150424.063110 accepted/tizen/wearable/20150424.063656 submit/tizen/20150424.010440
authorBoram Park <boram1288.park@samsung.com>
Tue, 21 Apr 2015 06:59:05 +0000 (15:59 +0900)
committerBoram Park <boram1288.park@samsung.com>
Tue, 21 Apr 2015 06:59:05 +0000 (15:59 +0900)
Change-Id: I5589d5d017aa5c25941581c0fcf85be327ac8c6e

src/bin/e_pixmap.c

index 22ffb8c9fa899fbb88e77fecd7198dcf3cb9b40c..b3228beac03bca3c792e0e854db039bac417fe92 100644 (file)
@@ -36,10 +36,10 @@ struct _E_Pixmap
    struct wl_listener buffer_destroy_listener;
    void *data;
    Eina_Rectangle opaque;
-
-   E_Comp_Wl_Client_Data *cdata;
 #endif
 
+   E_Comp_Client_Data *cdata;
+
    Eina_Bool usable : 1;
    Eina_Bool dirty : 1;
    Eina_Bool image_argb : 1;
@@ -142,7 +142,11 @@ _e_pixmap_new(E_Pixmap_Type type)
    cp->w = cp->h = 0;
    cp->refcount = 1;
    cp->dirty = 1;
+#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
    cp->cdata = calloc(1, sizeof(E_Comp_Wl_Client_Data));
+#else
+   cp->cdata = calloc(1, sizeof(E_Comp_X_Client_Data));
+#endif
    return cp;
 }
 
@@ -966,5 +970,5 @@ e_pixmap_cdata_set(E_Pixmap *cp, E_Comp_Client_Data *cdata)
    EINA_SAFETY_ON_NULL_RETURN(cp);
    EINA_SAFETY_ON_NULL_RETURN(cdata);
    free (cp->cdata);
-   cp->cdata = (E_Comp_Wl_Client_Data*)cdata;
+   cp->cdata = cdata;
 }