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

Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype

Browse Source 
to xkb.h. Explicitly initialise nTypes in xkb.c.
This commit is contained in:
Daniel Stone 2006-03-25 22:37:58 +00:00
parent 1ef60ce8eb
commit b3570dd94a
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -10,6 +10,12 @@
* xkb/xkbInit.c: * xkb/xkbInit.c:
Remove weirdo XkbCF pre-configuration code. Remove weirdo XkbCF pre-configuration code.
* xkb/xkb.h:
* xkb/xkb.c:
Remove INITARGS braindamage, change to void; add XkbExtensionInit
prototype to xkb.h.
Explicitly initialise nTypes in xkb.c.
2006-03-25 Adam Jackson <ajax@freedesktop.org> 2006-03-25 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/common/xf86Bus.c: * hw/xfree86/common/xf86Bus.c:

4
xkb/xkb.c
View File

@ -2284,7 +2284,7 @@ ProcXkbSetMap(ClientPtr client)
XkbDescPtr xkb; XkbDescPtr xkb;
XkbChangesRec change; XkbChangesRec change;
XkbEventCauseRec cause; XkbEventCauseRec cause;
int nTypes,nActions,error; int nTypes = 0,nActions,error;
char * tmp; char * tmp;
CARD8 mapWidths[XkbMaxLegalKeyCode+1]; CARD8 mapWidths[XkbMaxLegalKeyCode+1];
CARD16 symsPerKey[XkbMaxLegalKeyCode+1]; CARD16 symsPerKey[XkbMaxLegalKeyCode+1];
@ -6214,7 +6214,7 @@ XkbResetProc(ExtensionEntry *extEntry)
} }
void void
XkbExtensionInit(INITARGS) XkbExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;

2
xkb/xkb.h
View File

@ -32,6 +32,8 @@ extern int ProcXkbSetDebuggingFlags(ClientPtr client);
extern int XkbSetRepeatRate(DeviceIntPtr dev, int timeout, int interval, int major, int minor); extern int XkbSetRepeatRate(DeviceIntPtr dev, int timeout, int interval, int major, int minor);
extern int XkbGetRepeatRate(DeviceIntPtr dev, int *timeout, int *interval); extern int XkbGetRepeatRate(DeviceIntPtr dev, int *timeout, int *interval);
extern void XkbExtensionInit(void);
extern Status XkbComputeGetIndicatorMapReplySize( extern Status XkbComputeGetIndicatorMapReplySize(
XkbIndicatorPtr indicators, XkbIndicatorPtr indicators,
xkbGetIndicatorMapReply *rep); xkbGetIndicatorMapReply *rep);