diff options
| author | Jonathan Lyons <jclyons at wesleyan.edu> | 2012-04-02 11:37:43 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-04-02 11:37:43 +0200 |
| commit | 798ce6c0e1cc28eba8c444809e7e8de01bfccec7 (patch) | |
| tree | 2623a73a61d8ccf92bc90e98714b36be788d46ad /sys | |
| parent | 086bee8c143db0cdf8b18a84f311b8d7c7e2d75f (diff) | |
x11: fix build without XSHM
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=673327
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ximage/ximagepool.c | 2 | ||||
| -rw-r--r-- | sys/xvimage/xvimagepool.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sys/ximage/ximagepool.c b/sys/ximage/ximagepool.c index f2f2aa28b..f46e2e7e1 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 a7123149e..f23818e97 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 |