frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into my-XACE-SELINUX

This commit is contained in:
Eamon Walsh 2006-12-22 13:53:55 -05:00 committed by Eamon Walsh
parent 4b1c9ac3d1 d9e079d2a3
commit 43a4376bd7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/dispatch.c
View File

@ -3752,6 +3752,8 @@ InitClientPrivates(ClientPtr client)
client->devPrivates = ppriv;
sizes = clientPrivateSizes;
ptr = (char *)(ppriv + clientPrivateLen);
if (ppriv)
bzero(ppriv, totalClientSize - sizeof(ClientRec));
for (i = clientPrivateLen; --i >= 0; ppriv++, sizes++)
{
if ( (size = *sizes) )

2
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -649,7 +649,7 @@ being
that are passed to the module when it is loaded.
.PP
Example: the extmod module (which contains a miscellaneous group of
server extensions) can be loaded, with the __xservername__-DGA extension
server extensions) can be loaded, with the XFree86-DGA extension
disabled by using the following entry:
.PP
.RS 4