xf86-video-intel: Branch 'xf86-video-intel-2.3-branch' - 2 commits - configure.ac src/i830_exa.c

[Zhenyu Wang]

 configure.ac   |    2 +-
 src/i830_exa.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 259ad818f2b7ac63fb84516e8a49e264840af107
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Wed Apr 23 13:42:24 2008 +0800

    Bump version 2.3.0

diff --git a/configure.ac b/configure.ac
index 001e5e1..da479dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.2.99.903,
+        2.3.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)
 
commit 5214139e30bb51bea8c18f270e060339678c8715
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Wed Apr 23 13:39:49 2008 +0800

    Fix warning with i830_exa_pixmap_is_offscreen() for exa minor >=2

diff --git a/src/i830_exa.c b/src/i830_exa.c
index 2c807c5..0ebf3df 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -121,6 +121,7 @@ i830_pixmap_tiled(PixmapPtr pPixmap)
     return FALSE;
 }
 
+#if EXA_VERSION_MINOR >= 2
 static Bool
 i830_exa_pixmap_is_offscreen(PixmapPtr pPixmap)
 {
@@ -136,6 +137,7 @@ i830_exa_pixmap_is_offscreen(PixmapPtr pPixmap)
 	return FALSE;
     }
 }
+#endif
 
 /**
  * I830EXASync - wait for a command to finish