diff options
author | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
commit | 1faa0f175bda9074b5f45e5e005d9a80721e3c24 (patch) | |
tree | 3a1c33cb65654d1a65979618dedf732b9ea11819 /xorg-server/dix/main.c | |
parent | af64ef0fd32e87e56c5b293eaef39f3b9791bfbb (diff) | |
parent | 87559ccfc67a98a75fa8068066871c35caa88e30 (diff) | |
download | vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.gz vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.bz2 vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/main.c')
-rw-r--r-- | xorg-server/dix/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index 0e3a8567a..4c81c4d1b 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -228,9 +228,10 @@ int main(int argc, char *argv[], char *envp[]) clients[0] = serverClient;
currentMaxClients = 1;
+ /* Initialize privates before first allocation */
dixResetPrivates();
- /* Initialize server client devPrivates, to be reallocated as
+ /* Initialize server client devPrivates, to be reallocated as
* more client privates are registered
*/
if (!dixAllocatePrivates(&serverClient->devPrivates, PRIVATE_CLIENT))
|