From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/include/input.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xorg-server/include/input.h') diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index 2d5e531ef..455963f6a 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 */ , -- cgit v1.2.3