diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-03-04 18:11:10 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-03-04 18:11:10 +1030 |
| commit | 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd (patch) | |
| tree | 9f477ddd4af2162152057bded1426102b475e67c /xkb/ddxList.c | |
| parent | 23ae68a4c74a2ec90b4130c37b0d0aec3f4082ce (diff) | |
| parent | 453661a9e193a511cf5e54e6d330454163817316 (diff) | |
Merge branch 'master' into mpx
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
Diffstat (limited to 'xkb/ddxList.c')
| -rw-r--r-- | xkb/ddxList.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 2baf65248..ae3a7f7e0 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.c @@ -43,14 +43,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <xkbsrv.h> #include <X11/extensions/XI.h> -#ifndef PATH_MAX -#ifdef MAXPATHLEN -#define PATH_MAX MAXPATHLEN -#else -#define PATH_MAX 1024 -#endif -#endif - #ifdef WIN32 /* from ddxLoad.c */ extern const char* Win32TempDir(); @@ -199,9 +191,8 @@ char tmpname[PATH_MAX]; #ifndef WIN32 in= Popen(buf,"r"); #else -#ifdef DEBUG_CMD - ErrorF("[xkb] xkb executes: %s\n",buf); -#endif + if (xkbDebugFlags) + DebugF("[xkb] xkbList executes: %s\n",buf); if (System(buf) < 0) ErrorF("[xkb] Could not invoke keymap compiler\n"); else |