dmx: Fix XSetExtensionErrorHandler calls to agree on constness.
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
parent
b13d7a8e09
commit
d1bad1b59f
|
@ -370,7 +370,7 @@ void dmxCommonOthGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
|
||||||
Display *display = priv->display;
|
Display *display = priv->display;
|
||||||
int num;
|
int num;
|
||||||
int i, j, k;
|
int i, j, k;
|
||||||
int (*handler)(Display *, char *, char *);
|
XextErrorHandler handler;
|
||||||
|
|
||||||
if (!display && !(display = XOpenDisplay(dmxInput->name)))
|
if (!display && !(display = XOpenDisplay(dmxInput->name)))
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -839,7 +839,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
|
||||||
Display *display;
|
Display *display;
|
||||||
int num;
|
int num;
|
||||||
int i, j;
|
int i, j;
|
||||||
int (*handler)(Display *, char *, char *);
|
XextErrorHandler handler;
|
||||||
|
|
||||||
if (!(display = XOpenDisplay(dmxInput->name))) return;
|
if (!(display = XOpenDisplay(dmxInput->name))) return;
|
||||||
|
|
||||||
|
|
|
@ -276,8 +276,8 @@ extern void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl *ctrl);
|
||||||
extern void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
|
extern void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
|
||||||
pointer ctrl, int unknown);
|
pointer ctrl, int unknown);
|
||||||
|
|
||||||
extern int dmxInputExtensionErrorHandler(Display *dsp, char *name,
|
extern int dmxInputExtensionErrorHandler(Display *dsp, _Xconst char *name,
|
||||||
char *reason);
|
_Xconst char *reason);
|
||||||
|
|
||||||
extern int dmxInputDetach(DMXInputInfo *dmxInput);
|
extern int dmxInputDetach(DMXInputInfo *dmxInput);
|
||||||
extern void dmxInputDetachAll(DMXScreenInfo *dmxScreen);
|
extern void dmxInputDetachAll(DMXScreenInfo *dmxScreen);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user