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

1 files changed, 5 insertions, 5 deletions

diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index 617ec5e49..37b302a25 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -412,7 +412,7 @@ void dmxGetColormaps(DMXScreenInfo *dmxScreen)
     int i;

 

     dmxScreen->beNumDefColormaps = dmxScreen->beNumVisuals;

-    dmxScreen->beDefColormaps = xalloc(dmxScreen->beNumDefColormaps *

+    dmxScreen->beDefColormaps = malloc(dmxScreen->beNumDefColormaps *

 				       sizeof(*dmxScreen->beDefColormaps));

 

     for (i = 0; i < dmxScreen->beNumDefColormaps; i++)

@@ -738,7 +738,7 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
 		nconfigs = dmxScreen->numGlxVisuals;

 	    }

 

-	    configprivs = xalloc(nconfigs * sizeof(dmxGlxVisualPrivate*));

+	    configprivs = malloc(nconfigs * sizeof(dmxGlxVisualPrivate*));

 

 	    if (configs != NULL && configprivs != NULL) {

 

@@ -748,7 +748,7 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
 		for (i = 0; i < nconfigs; i++) {

 

 		    configprivs[i] = (dmxGlxVisualPrivate *)

-			xalloc(sizeof(dmxGlxVisualPrivate));

+			malloc(sizeof(dmxGlxVisualPrivate));

 		    configprivs[i]->x_visual_depth = 0;

 		    configprivs[i]->x_visual_class = 0;

 

@@ -816,11 +816,11 @@ static void dmxSetDefaultFontPath(char *fp)
 	int len;

 

 	len = strlen(dmxFontPath);

-	dmxFontPath = xrealloc(dmxFontPath, len+fplen+1);

+	dmxFontPath = realloc(dmxFontPath, len+fplen+1);

 	dmxFontPath[len] = ',';

 	strncpy(&dmxFontPath[len+1], fp, fplen);

     } else {

-	dmxFontPath = xalloc(fplen);

+	dmxFontPath = malloc(fplen);

 	strncpy(dmxFontPath, fp, fplen);

     }