Module Name: xsrc
Committed By: mrg
Date: Sat Jul 23 21:56:54 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c
Log Message:
add back support for xorg-server 1.9 Xinput APIs
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
diff -u xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.1.1.3 xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.2
--- xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.1.1.3 Sat Jul 23 21:00:02 2011
+++ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Sat Jul 23 21:56:54 2011
@@ -725,15 +725,21 @@
-1, -1,
9500,
0 /* min_res */,
- 9500 /* max_res */,
- Absolute);
+ 9500 /* max_res */
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,0,0)
+ , Absolute
+#endif
+ );
InitValuatorAxisStruct(dev, 1,
axis_labels[1],
-1, -1,
10500,
0 /* min_res */,
- 10500 /* max_res */,
- Absolute);
+ 10500 /* max_res */
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,0,0)
+ , Absolute
+#endif
+ );
}
if (InitFocusClassDeviceStruct(dev) == FALSE) {
