Mercurial > mplayer.hg

diff gui/wm/ws.h @ 34465:3c1a1038bfc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Properly handle the lack of XShm. The GUI compiles and runs fine without HAVE_SHM now.
author ib
date Thu, 12 Jan 2012 18:21:56 +0000
parents aa4bd0c197d8
children b03481253518
line wrap: on
line diff
--- a/gui/wm/ws.h	Thu Jan 12 16:14:20 2012 +0000
+++ b/gui/wm/ws.h	Thu Jan 12 18:21:56 2012 +0000
@@ -28,7 +28,9 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#ifdef HAVE_SHM
 #include <X11/extensions/XShm.h>
+#endif
 
 #define  wsKeyReleased   0
 #define  wsKeyPressed    1
@@ -158,7 +160,9 @@
     Atom AtomWMSizeHint;
     Atom AtomWMNormalHint;
 
+#ifdef HAVE_SHM
     XShmSegmentInfo Shminfo;
+#endif
     unsigned char *ImageData;
     unsigned short int *ImageDataw;
     unsigned int *ImageDatadw;