From 7d553a4c26e3add66d636bcde6b74fb48cfceabf Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Wed, 25 Dec 2013 17:06:32 +0100
Subject: vo_x11/vo_xv: fix build when using --disable-xext

---
 video/out/vo_x11.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'video/out/vo_x11.c')

diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c
index 35ca4cda0e..b7bd64b0a5 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -157,7 +157,7 @@ static int find_depth_from_visuals(struct vo *vo, Visual ** visual_return)
 static void getMyXImage(struct priv *p, int foo)
 {
     struct vo *vo = p->vo;
-#if HAVE_SHM
+#if HAVE_SHM && HAVE_XEXT
     if (vo->x11->display_is_local && XShmQueryExtension(vo->x11->display)) {
         p->Shmem_Flag = 1;
         vo->x11->ShmCompletionEvent = XShmGetEventBase(vo->x11->display)
@@ -221,7 +221,7 @@ shmemerror:
     memset(p->myximage[foo]->data, 0, p->myximage[foo]->bytes_per_line
                                       * p->image_height);
     p->ImageData[foo] = p->myximage[foo]->data;
-#if HAVE_SHM
+#if HAVE_SHM && HAVE_XEXT
 }
 #endif
 }
@@ -229,7 +229,7 @@ shmemerror:
 static void freeMyXImage(struct priv *p, int foo)
 {
     struct vo *vo = p->vo;
-#if HAVE_SHM
+#if HAVE_SHM && HAVE_XEXT
     if (p->Shmem_Flag) {
         XShmDetach(vo->x11->display, &p->Shminfo[foo]);
         XDestroyImage(p->myximage[foo]);
@@ -397,7 +397,7 @@ static void Display_Image(struct priv *p, XImage *myximage)
 
     XImage *x_image = p->myximage[p->current_buf];
 
-#if HAVE_SHM
+#if HAVE_SHM && HAVE_XEXT
     if (p->Shmem_Flag) {
         XShmPutImage(vo->x11->display, vo->x11->window, vo->x11->vo_gc, x_image,
                      0, 0, p->dst.x0, p->dst.y0, p->dst_w, p->dst_h,
@@ -443,7 +443,7 @@ static mp_image_t *get_screenshot(struct vo *vo)
 
 static void wait_for_completion(struct vo *vo, int max_outstanding)
 {
-#if HAVE_SHM
+#if HAVE_SHM && HAVE_XEXT
     struct priv *ctx = vo->priv;
     struct vo_x11_state *x11 = vo->x11;
     if (ctx->Shmem_Flag) {
-- 
cgit v1.2.3