xserver: Branch 'master' - 2 commits

[Michel Daenzer]

 exa/exa_offscreen.c            |    2 +-
 hw/xfree86/int10/helper_exec.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 2a75c774975b50dd4e71b7dbea7bd65ca2984a43 (from 0ede39a25cf5b0b6c2c89677f810c21ce42b95df)
Author: Dodji Seketeli <dodji at seketeli.org>
Date:   Tue Jul 3 11:00:29 2007 +0200

    ExaOffscreenMarkUsed: Don't crash when there's no offscreen memory.

diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
index 6fe646a..c666b00 100644
--- a/exa/exa_offscreen.c
+++ b/exa/exa_offscreen.c
@@ -429,7 +429,7 @@ ExaOffscreenMarkUsed (PixmapPtr pPixmap)
     ExaScreenPriv (pPixmap->drawable.pScreen);
     static int iter = 0;
 
-    if (!pExaPixmap->area)
+    if (!pExaPixmap || !pExaPixmap->area)
 	return;
 
     /* The numbers here are arbitrary.  We may want to tune these. */
diff-tree 0ede39a25cf5b0b6c2c89677f810c21ce42b95df (from 028a00bc518dc6908839e8ce7c50ab1837100945)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Jul 3 10:55:13 2007 +0200

    Fix build when int10 doesn't use x86emu.

diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 6e5cff9..a41965d 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -29,7 +29,9 @@
 #define _INT10_PRIVATE
 #include "int10Defines.h"
 #include "xf86int10.h"
+#ifdef _X86EMU
 #include "x86emu/x86emui.h"
+#endif
 
 static int pciCfg1in(CARD16 addr, CARD32 *val);
 static int pciCfg1out(CARD16 addr, CARD32 val);