xserver: Branch 'master'

[Kristian Høgsberg]

 include/regionstr.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7536f4b87e089a7e7c43026b189922fec70c565
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Tue Mar 11 13:11:04 2008 -0400

    Silence REGION_INIT() warning.
    
    Evaluating the address of a BoxRec as a boolean gives this warning:
    
      i830_driver.c:2317: warning: the address of 'ScreenBox' will always
      evaluate as 'true'
    
    which is pretty annoying.  This patch compares the address to NULL to
    avoid the pointer->bool conversion and gets rid of the warning.  Seems
    like a lame hack, but the warning is worse.

diff --git a/include/regionstr.h b/include/regionstr.h
index f44cab7..5a79b12 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -158,7 +158,7 @@ extern RegDataRec miBrokenData;
 
 #define REGION_INIT(_pScreen, _pReg, _rect, _size) \
 { \
-    if (_rect) \
+    if ((_rect) != NULL)				\
     { \
         (_pReg)->extents = *(_rect); \
         (_pReg)->data = (RegDataPtr)NULL; \