svn merge -r588:HEAD ^/branches/released .

1 files changed, 3 insertions, 3 deletions

diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index 6cde35553..a4080d39f 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -218,7 +218,7 @@ int main(int argc, char *argv[], char *envp[])
 	    InitProcVectors();

 	    for (i=1; i<MAXCLIENTS; i++)

 		clients[i] = NullClient;

-	    serverClient = xalloc(sizeof(ClientRec));

+	    serverClient = malloc(sizeof(ClientRec));

 	    if (!serverClient)

 		FatalError("couldn't create server client");

 	    InitClient(serverClient, 0, (pointer)NULL);

@@ -358,7 +358,7 @@ int main(int argc, char *argv[], char *envp[])
 	    FreeDefaultStipple(i);

 	    (* screenInfo.screens[i]->CloseScreen)(i, screenInfo.screens[i]);

 	    dixFreePrivates(screenInfo.screens[i]->devPrivates);

-	    xfree(screenInfo.screens[i]);

+	    free(screenInfo.screens[i]);

 	    screenInfo.numScreens = i;

 	}

 	FreeFonts();

@@ -381,7 +381,7 @@ int main(int argc, char *argv[], char *envp[])
 	    break;

 	}

 

-	xfree(ConnectionInfo);

+	free(ConnectionInfo);

 	ConnectionInfo = NULL;

     }

     return(0);