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/dmxlog.c | |
| 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/dmxlog.c')
| -rw-r--r-- | xorg-server/hw/dmx/dmxlog.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/dmx/dmxlog.c b/xorg-server/hw/dmx/dmxlog.c index 31a74cdf1..94b803528 100644 --- a/xorg-server/hw/dmx/dmxlog.c +++ b/xorg-server/hw/dmx/dmxlog.c @@ -42,10 +42,8 @@ #include "dmx.h" #include "dmxlog.h" #include "dmxinput.h" -#ifdef XINPUT #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> -#endif static dmxLogLevel dmxCurrentLogLevel = dmxDebug; @@ -279,7 +277,6 @@ void dmxLogVisual(DMXScreenInfo *dmxScreen, XVisualInfo *vi, int defaultVisual) } } -#ifdef XINPUT /** Translate a (normalized) XInput event \a type into a human-readable * string. */ const char *dmxXInputEventName(int type) @@ -305,7 +302,6 @@ const char *dmxXInputEventName(int type) } #endif -#endif /** Translate an event \a type into a human-readable string. */ const char *dmxEventName(int type) |