diff options
| author | Keith Packard <keithp@keithp.com> | 2012-07-02 22:35:39 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-02 22:35:39 -0700 |
| commit | 24525d96a3b9dba67eb75042500b2f208a2cc246 (patch) | |
| tree | 13daa795a9e5a2645d9de1bf1e44d1be7c056a80 /dix/getevents.c | |
| parent | 4cd91bd4c6325b2e617ca90a725f02ac124c2372 (diff) | |
| parent | 35e3d229150395a222a0f53318daf5dbeb8f6eb6 (diff) | |
Merge branch 'sigsafe-logging-varargs'
This merge includes a minor fixup for '%p' arguments; must cast to
uintptr_t instead of uint64_t as we use -Werror=pointer-to-int-cast
which complains when doing a cast (even explicitly) from a pointer
to an integer of different size.
Diffstat (limited to 'dix/getevents.c')
| -rw-r--r-- | dix/getevents.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 75708520f..27c2e04d1 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -1867,8 +1867,8 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, touchpoint.ti = TouchFindByDDXID(dev, ddx_touchid, (type == XI_TouchBegin)); if (!touchpoint.ti) { - ErrorF("[dix] %s: unable to %s touch point %x\n", dev->name, - type == XI_TouchBegin ? "begin" : "find", ddx_touchid); + ErrorFSigSafe("[dix] %s: unable to %s touch point %u\n", dev->name, + type == XI_TouchBegin ? "begin" : "find", ddx_touchid); return 0; } client_id = touchpoint.ti->client_id; |