On Mon, May 21, 2012 at 01:22:33AM +0200, Marcin Slusarz wrote:
> Signed-off-by: Marcin Slusarz <[email protected]>
> ---
> There are many more, but they need fixes to xserver API.
this is going to cause some warnings on older servers, but I'll probably
drop those instead of hacking around it.
merged, thanks
Cheers,
Peter
> ---
> src/emuWheel.c | 4 ++--
> src/evdev.c | 10 +++++-----
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/src/emuWheel.c b/src/emuWheel.c
> index ae894fa..db989c5 100644
> --- a/src/emuWheel.c
> +++ b/src/emuWheel.c
> @@ -51,7 +51,6 @@ static Atom prop_wheel_timeout = 0;
> static Atom prop_wheel_button = 0;
>
> /* Local Funciton Prototypes */
> -static BOOL EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr
> pAxis, char *axis_name);
> static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int
> value);
>
> /* Filter mouse button events */
> @@ -197,7 +196,8 @@ EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr
> axis, int value)
> /* Handle button mapping here to avoid code duplication,
> returns true if a button mapping was found. */
> static BOOL
> -EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis, char*
> axis_name)
> +EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis,
> + const char *axis_name)
> {
> EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
> char *option_string;
> diff --git a/src/evdev.c b/src/evdev.c
> index 140a633..feb018c 100644
> --- a/src/evdev.c
> +++ b/src/evdev.c
> @@ -277,7 +277,7 @@ EvdevRemoveDevice(InputInfoPtr pInfo)
>
>
> static void
> -SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
> +SetXkbOption(InputInfoPtr pInfo, const char *name, char **option)
> {
> char *s;
>
> @@ -2547,7 +2547,7 @@ EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int
> code)
> /* Aligned with linux/input.h.
> Note that there are holes in the ABS_ range, these are simply replaced
> with
> MISC here */
> -static char* abs_labels[] = {
> +static const char *abs_labels[] = {
> AXIS_LABEL_PROP_ABS_X, /* 0x00 */
> AXIS_LABEL_PROP_ABS_Y, /* 0x01 */
> AXIS_LABEL_PROP_ABS_Z, /* 0x02 */
> @@ -2610,7 +2610,7 @@ static char* abs_labels[] = {
> AXIS_LABEL_PROP_ABS_MT_PRESSURE, /* 0x3a */
> };
>
> -static char* rel_labels[] = {
> +static const char *rel_labels[] = {
> AXIS_LABEL_PROP_REL_X,
> AXIS_LABEL_PROP_REL_Y,
> AXIS_LABEL_PROP_REL_Z,
> @@ -2623,7 +2623,7 @@ static char* rel_labels[] = {
> AXIS_LABEL_PROP_REL_MISC
> };
>
> -static char* btn_labels[][16] = {
> +static const char *btn_labels[][16] = {
> { /* BTN_MISC group offset 0x100*/
> BTN_LABEL_PROP_BTN_0, /* 0x00 */
> BTN_LABEL_PROP_BTN_1, /* 0x01 */
> @@ -2708,7 +2708,7 @@ static void EvdevInitAxesLabels(EvdevPtr pEvdev, int
> mode, int natoms, Atom *ato
> {
> Atom atom;
> int axis;
> - char **labels;
> + const char **labels;
> int labels_len = 0;
>
> if (mode == Absolute)
> --
> 1.7.8.6
>
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
