svn merge ^/branches/released .

3 files changed, 6 insertions, 4 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 1dea47feb..bd90e6ca3 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -1787,9 +1787,11 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
     XF86ConfDisplayPtr dispptr;

     XF86ConfAdaptorLinkPtr conf_adaptor;

     Bool defaultMonitor = FALSE;

+    XF86ConfScreenRec local_conf_screen;

 

     if (!conf_screen) {

-        conf_screen = xnfcalloc(1, sizeof(XF86ConfScreenRec));

+        memset(&local_conf_screen, 0, sizeof(local_conf_screen));

+        conf_screen = &local_conf_screen;

         conf_screen->scrn_identifier = "Default Screen Section";

         xf86Msg(X_DEFAULT, "No screen section available. Using defaults.\n");

     }

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index 0aa6f2cf4..a6266e725 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -369,13 +369,13 @@ VGAarbiterClearToBackground (
 }

 

 static PixmapPtr

-VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

+VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)

 {

     PixmapPtr pPix;

 

     SCREEN_PROLOG ( CreatePixmap);

     VGAGet(pScreen);

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, class);

     VGAPut();

     SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);

 

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 13fde5e79..0f8416b71 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -155,7 +155,7 @@ static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
 static void VGAarbiterClearToBackground (WindowPtr pWin, int x, int y, int w,

     int h, Bool generateExposures);

 static PixmapPtr VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h,

-    int depth, unsigned int usage_hint);

+    int depth, unsigned int class);

 static Bool  VGAarbiterCreateGC(GCPtr pGC);

 static Bool VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank);

 static void VGAarbiterStoreColors (ColormapPtr pmap, int ndef, xColorItem