From 798ce6c0e1cc28eba8c444809e7e8de01bfccec7 Mon Sep 17 00:00:00 2001
From: Jonathan Lyons <jclyons at wesleyan.edu>
Date: Mon, 2 Apr 2012 11:37:43 +0200
Subject: [PATCH] x11: fix build without XSHM

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=673327
---
 sys/ximage/ximagepool.c   | 2 ++
 sys/xvimage/xvimagepool.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sys/ximage/ximagepool.c b/sys/ximage/ximagepool.c
index f2f2aa28b2..f46e2e7e11 100644
--- a/sys/ximage/ximagepool.c
+++ b/sys/ximage/ximagepool.c
@@ -259,6 +259,7 @@ create_failed:
         ("could not XShmCreateImage a %dx%d image", width, height));
     goto beach;
   }
+#ifdef HAVE_XSHM
 shmget_failed:
   {
     g_mutex_unlock (ximagesink->x_lock);
@@ -290,6 +291,7 @@ xattach_failed:
             width, height), ("Failed to XShmAttach"));
     goto beach;
   }
+#endif
 }
 
 static void
diff --git a/sys/xvimage/xvimagepool.c b/sys/xvimage/xvimagepool.c
index a7123149ee..f23818e974 100644
--- a/sys/xvimage/xvimagepool.c
+++ b/sys/xvimage/xvimagepool.c
@@ -293,6 +293,7 @@ create_failed:
         ("could not XvShmCreateImage a %dx%d image", width, height));
     goto beach;
   }
+#ifdef HAVE_XSHM
 shmget_failed:
   {
     g_mutex_unlock (xvimagesink->x_lock);
@@ -324,6 +325,7 @@ xattach_failed:
             width, height), ("Failed to XShmAttach"));
     goto beach;
   }
+#endif
 }
 
 static void