xserver: Branch 'server-1.5-branch' - 2 commits

[Adam Jackson]

 fb/fb24_32.c                         |   10 ++++------
 hw/xfree86/os-support/shared/sigio.c |    3 +++
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit b0df9a6a421de5ed49a898cb01527bc40baf5814
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Mon May 19 02:24:17 2008 +0200

    preserve errno around the SIGIO handler
    (cherry picked from commit 19c7e9da55646f1f6e05c28cd71865cd8d84e1ff)

diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index c97f503..f51131c 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -101,6 +101,7 @@ xf86SIGIO (int sig)
     int	    i;
     fd_set  ready;
     struct timeval  to;
+    int save_errno = errno;	/* do not clobber the global errno */
     int	    r;
 
     ready = xf86SigIOMask;
@@ -117,6 +118,8 @@ xf86SIGIO (int sig)
     if (r > 0) {
       xf86Msg(X_ERROR, "SIGIO %d descriptors not handled\n", r);
     }
+    /* restore global errno */
+    errno = save_errno;
 }
 
 static int
commit fc37f8fcb20663159d2a8cef6c9bfca039465534
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Jun 20 13:27:32 2008 -0400

    Bug #12414: Create full-fledged pixmaps in fb24_32ReformatTile().
    
    ... instead of creating pixmaps that only fb knows about, which will
    have no devPrivates for any other subsystem and thus cause havoc if
    (when) they leak out.
    (cherry picked from commit b55fbca4f0705aeff1c69d3ef851c5ff5af6ed94)

diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index a03726b..1ebd598 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -544,11 +543,10 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
     int		oldXoff, oldYoff;
     int		newXoff, newYoff;
 
-    pNewTile = fbCreatePixmapBpp (pScreen,
-				  pOldTile->drawable.width,
-				  pOldTile->drawable.height,
-				  pOldTile->drawable.depth,
-				  bitsPerPixel, 0);
+    pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width,
+				     pOldTile->drawable.height,
+				     pOldTile->drawable.depth,
+				     pOldTile->usage_hint);
     if (!pNewTile)
 	return 0;
     fbGetDrawable (&pOldTile->drawable,