Commit e28575b2 authored by Peter Hutterer's avatar Peter Hutterer

Use LogMessageVerbSigSafe on ABI 18

Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: default avatarChase Douglas <chase.douglas@canonical.com>
parent 00109747
......@@ -508,13 +508,13 @@ SynapticsReadEvent(InputInfoPtr pInfo, struct input_event *ev)
if (len <= 0) {
/* We use X_NONE here because it doesn't alloc */
if (errno != EAGAIN)
xf86MsgVerb(X_NONE, 0, "%s: Read error %s\n", pInfo->name,
strerror(errno));
LogMessageVerbSigSafe(X_ERROR, 0, "%s: Read error %d\n", pInfo->name,
errno);
rc = FALSE;
}
else if (len % sizeof(*ev)) {
xf86MsgVerb(X_NONE, 0, "%s: Read error, invalid number of bytes.",
pInfo->name);
LogMessageVerbSigSafe(X_ERROR, 0, "%s: Read error, invalid number of bytes.",
pInfo->name);
rc = FALSE;
}
return rc;
......
......@@ -480,8 +480,8 @@ ps2_synaptics_get_packet(InputInfoPtr pInfo, struct PS2SynapticsHwInfo *synhw,
/* to avoid endless loops */
if (count++ > 30) {
xf86IDrvMsg(pInfo, X_ERROR,
"Synaptics driver lost sync... got gigantic packet!\n");
LogMessageVerbSigSafe(X_ERROR, 0,
"Synaptics driver lost sync... got gigantic packet!\n");
return FALSE;
}
......@@ -534,8 +534,8 @@ PS2ReadHwStateProto(InputInfoPtr pInfo,
synhw = (struct PS2SynapticsHwInfo *) priv->proto_data;
if (!synhw) {
xf86IDrvMsg(pInfo, X_ERROR,
"PS2ReadHwState, synhw is NULL. This is a bug.\n");
LogMessageVerbSigSafe(X_ERROR, 0,
"PS2ReadHwState, synhw is NULL. This is a bug.\n");
return FALSE;
}
......
......@@ -24,6 +24,10 @@
#include "synproto.h"
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 18
#define LogMessageVerbSigSafe xf86MsgVerb
#endif
#ifdef DBG
#undef DBG
#endif
......
......@@ -316,6 +316,12 @@ xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)
return;
}
_X_EXPORT void
LogMessageVerbSigSafe(MessageType type, int verb, const char *format, ...)
{
return;
}
_X_EXPORT void
xf86PostMotionEventP(DeviceIntPtr device,
int is_absolute, int first_valuator, int num_valuators,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment