aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/input.h
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/include/input.h')
-rw-r--r--xorg-server/include/input.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index b42510d9b..a23ce5c3f 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -163,7 +163,7 @@ typedef Bool (*PointerAccelSchemeInitProc) (DeviceIntPtr /*dev */ ,
/*protoScheme */ );
typedef struct _DeviceRec {
- pointer devicePrivate;
+ void *devicePrivate;
ProcessInputProc processInputProc; /* current */
ProcessInputProc realInputProc; /* deliver */
ProcessInputProc enqueueInputProc; /* enqueue */
@@ -221,12 +221,12 @@ typedef struct _InputOption InputOption;
typedef struct _XI2Mask XI2Mask;
typedef struct _InputAttributes {
- char *product;
- char *vendor;
- char *device;
- char *pnp_id;
- char *usb_id;
- char **tags; /* null-terminated */
+ const char *product;
+ const char *vendor;
+ const char *device;
+ const char *pnp_id;
+ const char *usb_id;
+ const char **tags; /* null-terminated */
uint32_t flags;
} InputAttributes;
@@ -316,7 +316,7 @@ extern _X_EXPORT Bool InitTouchClassDeviceStruct(DeviceIntPtr /*device */ ,
typedef void (*BellProcPtr) (int /*percent */ ,
DeviceIntPtr /*device */ ,
- pointer /*ctrl */ ,
+ void */*ctrl */ ,
int);
typedef void (*KbdCtrlProcPtr) (DeviceIntPtr /*device */ ,