diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-04 12:18:13 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-04 12:23:48 +0100 |
| commit | 45392e4a0642880b569ea5d4a350cdc395a2c7db (patch) | |
| tree | c3c2a49de903a18c3f8e1bf79684c29337ebcf7c /xorg-server/include/input.h | |
| parent | 5ec0616d4e3c4c6095f4975abbe9c21e5b6af967 (diff) | |
| parent | 321c01267ae1c446f1bd22b642567fcafa016c02 (diff) | |
| download | vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.gz vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.bz2 vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glthread.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/main/bufferobj.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/winmultiwindowwm.c
Diffstat (limited to 'xorg-server/include/input.h')
| -rw-r--r-- | xorg-server/include/input.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index fd3e209e5..bd947dab3 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -95,8 +95,8 @@ SOFTWARE. #define NO_AXIS_LIMITS -1 -#define MAP_LENGTH 256 -#define DOWN_LENGTH 32 /* 256/8 => number of bytes to hold 256 bits */ +#define MAP_LENGTH MAX_BUTTONS +#define DOWN_LENGTH (MAX_BUTTONS/8) /* 256/8 => number of bytes to hold 256 bits */ #define NullGrab ((GrabPtr)NULL) #define PointerRootWin ((WindowPtr)PointerRoot) #define NoneWin ((WindowPtr)None) @@ -221,12 +221,12 @@ typedef struct _InputOption InputOption; typedef struct _XI2Mask XI2Mask; typedef struct _InputAttributes { - const char *product; - const char *vendor; - const char *device; - const char *pnp_id; - const char *usb_id; - const char **tags; /* null-terminated */ + char *product; + char *vendor; + char *device; + char *pnp_id; + char *usb_id; + char **tags; /* null-terminated */ uint32_t flags; } InputAttributes; |