diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2016-05-19 10:17:52 -0500 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2016-05-19 10:23:22 -0500 |
| commit | e5e875ded86a59469ac6eebb45a9cbb6f36f4c20 (patch) | |
| tree | 6bb6e8f0c8651e8205561d223224921e664f063e | |
| parent | bd1847162ed6a648aa556fad9f93f663bf33e213 (diff) | |
| download | enlightenment-e5e875ded86a59469ac6eebb45a9cbb6f36f4c20.tar.gz | |
Fix dmabuf breakage of non wayland builds.
#IWearTheHatOfShame
| -rw-r--r-- | src/bin/e_pixmap.c | 4 | ||||
| -rw-r--r-- | src/bin/e_pixmap.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index f45da37471..febb689ec0 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -684,10 +684,12 @@ e_pixmap_is_pixels(E_Pixmap *cp) { case E_PIXMAP_TYPE_X: return EINA_FALSE; +#ifdef HAVE_WAYLAND case E_PIXMAP_TYPE_WL: if (!cp->buffer) return EINA_TRUE; if (cp->buffer->shm_buffer) return EINA_TRUE; return EINA_FALSE; +#endif default: return EINA_TRUE; } @@ -1043,6 +1045,7 @@ e_pixmap_alias(E_Pixmap *cp, E_Pixmap_Type type, ...) va_end(l); } +#ifdef HAVE_WAYLAND E_API Eina_Bool e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *dmabuf) { @@ -1064,3 +1067,4 @@ e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *dmabuf) return EINA_TRUE; } +#endif diff --git a/src/bin/e_pixmap.h b/src/bin/e_pixmap.h index 1a6fb026df..ed04078f7f 100644 --- a/src/bin/e_pixmap.h +++ b/src/bin/e_pixmap.h @@ -53,7 +53,9 @@ E_API void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int * E_API void e_pixmap_alias(E_Pixmap *cp, E_Pixmap_Type type, ...); +#ifdef HAVE_WAYLAND E_API Eina_Bool e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *); +#endif static inline Eina_Bool e_pixmap_is_x(const E_Pixmap *cp) |