diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/dmx/dmxclient.h | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx/dmxclient.h')
| -rw-r--r-- | xorg-server/hw/dmx/dmxclient.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/dmx/dmxclient.h b/xorg-server/hw/dmx/dmxclient.h index 8f018d153..f0c3608da 100644 --- a/xorg-server/hw/dmx/dmxclient.h +++ b/xorg-server/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> @@ -98,9 +96,7 @@ typedef XID KeySym64; #include <X11/extensions/XKBstr.h> #endif -#ifdef XINPUT #include <X11/extensions/XI.h> -#endif /* Always include these, since we query them even if we don't export XINPUT. */ #include <X11/extensions/XInput.h> /* For XDevice */ |