devilhorns pushed a commit to branch master.

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

commit 1c5e71bffc2b377071b51c5b0a02f4f0527d4724
Author: Chris Michael <[email protected]>
Date:   Tue Feb 10 12:41:27 2015 -0500

    fix e_pixmap compile for non-wayland usecase
    
    pixmap->border is only defined if we have some wayland support. Not
    used in X11.
    
    Signed-off-by: Chris Michael <[email protected]>
---
 src/bin/e_pixmap.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 0587554..c2dbe6f 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -892,15 +892,29 @@ EAPI void
 e_pixmap_image_border_set(E_Pixmap *cp, int l, int r, int t, int b)
 {
    EINA_SAFETY_ON_NULL_RETURN(cp);
+#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
    EINA_RECTANGLE_SET(&cp->border, t, b, l, r);
+#else
+   (void)l;
+   (void)r;
+   (void)t;
+   (void)b;
+#endif
 }
 
 EAPI void
 e_pixmap_image_border_get(E_Pixmap *cp, int *l, int *r, int *t, int *b)
 {
    EINA_SAFETY_ON_NULL_RETURN(cp);
+#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
    if (t) *t = cp->border.x;
    if (b) *b = cp->border.y;
    if (l) *l = cp->border.w;
    if (r) *r = cp->border.h;
+#else
+   if (t) *t = 0;
+   if (b) *b = 0;
+   if (l) *l = 0;
+   if (r) *r = 0;
+#endif
 }

-- 


Reply via email to