summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
Diffstat (limited to 'driver')
-rw-r--r--driver/xf86-input-ws/src/ws.c4
-rw-r--r--driver/xf86-input-ws/src/ws.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c
index fe24a4165..ef29032bf 100644
--- a/driver/xf86-input-ws/src/ws.c
+++ b/driver/xf86-input-ws/src/ws.c
@@ -13,7 +13,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $OpenBSD: ws.c,v 1.51 2011/12/29 13:48:05 matthieu Exp $ */
+/* $OpenBSD: ws.c,v 1.52 2012/06/12 17:04:43 shadchin Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -772,7 +772,7 @@ wsSetCalibProperty(DeviceIntPtr device, Atom atom, XIPropertyValuePtr val,
void
wsWheelHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis,
- char* axis_name, char* default_value)
+ const char* axis_name, const char* default_value)
{
WSDevicePtr priv = (WSDevicePtr)pInfo->private;
char *option_string;
diff --git a/driver/xf86-input-ws/src/ws.h b/driver/xf86-input-ws/src/ws.h
index 512648c2a..fd84b633d 100644
--- a/driver/xf86-input-ws/src/ws.h
+++ b/driver/xf86-input-ws/src/ws.h
@@ -95,5 +95,6 @@ extern BOOL wsWheelEmuFilterButton(InputInfoPtr, unsigned int, int);
extern BOOL wsWheelEmuFilterMotion(InputInfoPtr, int, int);
extern void wsWheelEmuInitProperty(DeviceIntPtr);
-extern void wsWheelHandleButtonMap(InputInfoPtr, WheelAxisPtr, char *, char *);
+extern void wsWheelHandleButtonMap(InputInfoPtr, WheelAxisPtr, const char *,
+ const char *);
extern void wsButtonClicks(InputInfoPtr, int, int);