andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dmx: Fix XSetExtensionErrorHandler calls to agree on constness.

Browse Source 
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Jamey Sharp 2010-05-25 14:25:07 -07:00
parent b13d7a8e09
commit d1bad1b59f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/dmx/input/dmxcommon.c
View File

@ -370,7 +370,7 @@ void dmxCommonOthGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
Display *display = priv->display;
int num;
int i, j, k;
int (*handler)(Display *, char *, char *);
XextErrorHandler handler;
if (!display && !(display = XOpenDisplay(dmxInput->name)))
return;

4
hw/dmx/input/dmxinputinit.c
View File

@ -827,7 +827,7 @@ static void dmxPopulateLocal(DMXInputInfo *dmxInput, dmxArg a)
}
}
int dmxInputExtensionErrorHandler(Display *dsp, char *name, char *reason)
int dmxInputExtensionErrorHandler(Display *dsp, _Xconst char *name, _Xconst char *reason)
{
return 0;
}
@ -839,7 +839,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
Display *display;
int num;
int i, j;
int (*handler)(Display *, char *, char *);
XextErrorHandler handler;
if (!(display = XOpenDisplay(dmxInput->name))) return;

4
hw/dmx/input/dmxinputinit.h
View File

@ -276,8 +276,8 @@ extern void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl *ctrl);
extern void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
pointer ctrl, int unknown);
extern int dmxInputExtensionErrorHandler(Display *dsp, char *name,
char *reason);
extern int dmxInputExtensionErrorHandler(Display *dsp, _Xconst char *name,
_Xconst char *reason);
extern int dmxInputDetach(DMXInputInfo *dmxInput);
extern void dmxInputDetachAll(DMXScreenInfo *dmxScreen);