mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-30 21:53:25 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: dix/privates.c
This commit is contained in:
commit
1f06d32ef5
64 changed files with 1363 additions and 639 deletions
|
|
@ -495,7 +495,7 @@ RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
|
|||
}
|
||||
|
||||
void
|
||||
InitBlockAndWakeupHandlers ()
|
||||
InitBlockAndWakeupHandlers (void)
|
||||
{
|
||||
xfree (handlers);
|
||||
handlers = (BlockHandlerPtr) 0;
|
||||
|
|
@ -895,7 +895,7 @@ DeleteCallbackList(CallbackListPtr *pcbl)
|
|||
}
|
||||
|
||||
void
|
||||
InitCallbackManager()
|
||||
InitCallbackManager(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue