Merge branch 'master' into XACE-SELINUX

Conflicts:

	dix/privates.c
This commit is contained in:
Eamon Walsh 2007-04-17 12:10:22 -04:00 • committed by Eamon Walsh
commit 1f06d32ef5
64 changed files with 1363 additions and 639 deletions

View file

@ -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;