x11: fix build without XSHM
authorJonathan Lyons <jclyons at wesleyan.edu>
Mon, 2 Apr 2012 09:37:43 +0000 (11:37 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 2 Apr 2012 09:37:43 +0000 (11:37 +0200)
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=673327

sys/ximage/ximagepool.c
sys/xvimage/xvimagepool.c

index f2f2aa28b2c3104ae83809cd47c76e6e2ce8b79e..f46e2e7e117855abc98216d2a904d69e55408fa1 100644 (file)
@@ -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
index a7123149eeb4fbfbb488ee89e2e4d7d03f3f71ea..f23818e974d0b7b1088eae223123d7097503c677 100644 (file)
@@ -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