diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-07-25 19:33:28 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-07-25 19:33:28 +0100 |
| commit | 63f22638336754eb9029722859aada83f094f393 (patch) | |
| tree | 5aeedf316a6cd999ecf26a596b2e708bae1aec15 /hw/dmx/dmxclient.h | |
| parent | 14509db233c248e91addc1d6b1fd46d1b2198a12 (diff) | |
| parent | 2ce434f54bc0d6050ef115e310df62c035e84bf2 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2
Diffstat (limited to 'hw/dmx/dmxclient.h')
| -rw-r--r-- | hw/dmx/dmxclient.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h index 91ba0493c..f0c3608da 100644 --- a/hw/dmx/dmxclient.h +++ b/hw/dmx/dmxclient.h @@ -84,9 +84,7 @@ typedef XID KeySym64; #include <X11/cursorfont.h> #include <X11/Xmu/SysUtil.h> /* For XmuSnprintf */ -#ifdef SHAPE #include <X11/extensions/shape.h> -#endif #ifdef RENDER #include <X11/extensions/Xrender.h> |