aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/glx/glxdricommon.c3
-rw-r--r--xorg-server/include/input.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c
index 97870b47e..79922154a 100644
--- a/xorg-server/glx/glxdricommon.c
+++ b/xorg-server/glx/glxdricommon.c
@@ -58,6 +58,7 @@ getUST(int64_t * ust)
#ifdef _MSC_VER
DebugBreak();
+ return -EFAULT;
#else
if (gettimeofday(&tv, NULL) == 0) {
ust[0] = (tv.tv_sec * 1000000) + tv.tv_usec;
@@ -66,7 +67,7 @@ getUST(int64_t * ust)
else {
return -errno;
}
- #endif
+#endif
}
const __DRIsystemTimeExtension systemTimeExtension = {
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 1745e9ade..f913e34ac 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -570,7 +570,7 @@ extern void TouchEventHistoryReplay(TouchPointInfoPtr ti, DeviceIntPtr dev,
extern Bool TouchResourceIsOwner(TouchPointInfoPtr ti, XID resource);
extern void TouchAddListener(TouchPointInfoPtr ti, XID resource, int resource_type,
enum InputLevel level, enum TouchListenerType type,
- enum TouchListenerState state, WindowPtr window, GrabPtr grab);
+ enum TouchListenerState state, WindowPtr window, const GrabPtr grab);
extern Bool TouchRemoveListener(TouchPointInfoPtr ti, XID resource);
extern void TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti,
InternalEvent *ev);